Commit 390d34e5 authored by Niels Möller's avatar Niels Möller
Browse files

Use LSH_CCPIC.

(IF_LD_PRELOAD): New substituted variable, set if we apepar to
use dynamic libraries.
(KRB_PROGRAM, PAM_PROGRAM): Deleted.

Rev: configure.ac:1.96
parent 7e4f9509
...@@ -195,6 +195,8 @@ if test "x$am_cv_prog_cc_stdc" = xno ; then ...@@ -195,6 +195,8 @@ if test "x$am_cv_prog_cc_stdc" = xno ; then
AC_MSG_ERROR([the C compiler doesn't handle ANSI-C]) AC_MSG_ERROR([the C compiler doesn't handle ANSI-C])
fi fi
LSH_CCPIC
AC_PROG_INSTALL AC_PROG_INSTALL
# According to the autoconf manual, needs install-sh from # According to the autoconf manual, needs install-sh from
...@@ -249,6 +251,24 @@ if test "x$M4" = x; then ...@@ -249,6 +251,24 @@ if test "x$M4" = x; then
fi fi
AC_ARG_VAR(M4, M4 macro processor) AC_ARG_VAR(M4, M4 macro processor)
# Check if we're using dynamic linking. For the getpwnam-wrapper.so
# hack used by the testsuite, we need LD_PRELOAD and $(CC) -shared.
# Might need a more sophisticated test.
IF_LD_PRELOAD='#'
if test "x$GCC" = xyes ; then
for d in /lib /lib64 /lib/64 ; do
for f in $d/libc.so $d/libc-*.so ; do
if test -x $f ; then
IF_LD_PRELOAD=''
break
fi
done
done
fi
AC_SUBST(IF_LD_PRELOAD)
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
...@@ -496,11 +516,9 @@ fi ...@@ -496,11 +516,9 @@ fi
AH_TEMPLATE([WITH_KERBEROS], [For kerberos]) AH_TEMPLATE([WITH_KERBEROS], [For kerberos])
if test x$enable_kerberos = xyes; then if test x$enable_kerberos = xyes; then
AC_DEFINE(WITH_KERBEROS) AC_DEFINE(WITH_KERBEROS)
KRB_PROGRAM=lsh-krb-checkpw
fi fi
AC_SUBST(KRB_LIBS) AC_SUBST(KRB_LIBS)
AC_SUBST(KRB_PROGRAM)
AH_TEMPLATE([WITH_PAM], [For PAM]) AH_TEMPLATE([WITH_PAM], [For PAM])
if test x$enable_pam = xyes; then if test x$enable_pam = xyes; then
...@@ -508,14 +526,11 @@ if test x$enable_pam = xyes; then ...@@ -508,14 +526,11 @@ if test x$enable_pam = xyes; then
if test x$enable_pam = xyes; then if test x$enable_pam = xyes; then
AC_DEFINE(WITH_PAM) AC_DEFINE(WITH_PAM)
PAM_PROGRAM=lsh-pam-checkpw
else else
AC_MSG_WARN([pam_start not found in libpam, disabling PAM]) AC_MSG_WARN([pam_start not found in libpam, disabling PAM])
fi fi
fi fi
AC_SUBST(PAM_PROGRAM)
AH_TEMPLATE([WITH_GCOV], [Use gcov]) AH_TEMPLATE([WITH_GCOV], [Use gcov])
if test "x$enable_gcov" = "xyes"; then if test "x$enable_gcov" = "xyes"; then
CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs" CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
...@@ -1177,8 +1192,6 @@ AC_SUBST(BUILD_ARCH, `uname -p`) ...@@ -1177,8 +1192,6 @@ AC_SUBST(BUILD_ARCH, `uname -p`)
AC_SUBST(BUILD_OSSYS,`uname -s`) AC_SUBST(BUILD_OSSYS,`uname -s`)
AC_SUBST(BUILD_OSREV,`uname -r`) AC_SUBST(BUILD_OSREV,`uname -r`)
# Should also generate rsync/Makefile and sftp
AC_CONFIG_FILES([Makefile src/config.make src/Makefile src/testsuite/Makefile AC_CONFIG_FILES([Makefile src/config.make src/Makefile src/testsuite/Makefile
doc/Makefile misc/Makefile doc/Makefile misc/Makefile
contrib/Makefile contrib/lsh.spec contrib/solpkg.sh]) contrib/Makefile contrib/lsh.spec contrib/solpkg.sh])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment