summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in16
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index aa62aede5..57c734a3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120000620
2 - (djm) Replace use of '-o' and '-a' logical operators in configure tests
3 with '||' and '&&'. As suggested by Jim Knoble <jmknoble@pint-stowp.cx>
4 to fix SCO Unixware problem reported by Gary E. Miller <gem@rellim.com>
5
120000618 620000618
2 - (djm) Add summary of configure options to end of ./configure run 7 - (djm) Add summary of configure options to end of ./configure run
3 - (djm) Not all systems define RUSAGE_SELF & RUSAGE_CHILDREN. Report from 8 - (djm) Not all systems define RUSAGE_SELF & RUSAGE_CHILDREN. Report from
diff --git a/configure.in b/configure.in
index d574cfc5c..2ae0d21c6 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ case "$host" in
31 AFS_LIBS="-lld" 31 AFS_LIBS="-lld"
32 CFLAGS="$CFLAGS -I/usr/local/include" 32 CFLAGS="$CFLAGS -I/usr/local/include"
33 LDFLAGS="$LDFLAGS -L/usr/local/lib" 33 LDFLAGS="$LDFLAGS -L/usr/local/lib"
34 if test "$LD" != "gcc" -a -z "$blibpath"; then 34 if (test "$LD" != "gcc" && test -z "$blibpath"); then
35 blibpath="/usr/lib:/lib:/usr/local/lib" 35 blibpath="/usr/lib:/lib:/usr/local/lib"
36 fi 36 fi
37 AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)]) 37 AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)])
@@ -230,7 +230,7 @@ AC_ARG_WITH(pam,
230 fi 230 fi
231 ] 231 ]
232) 232)
233if test -z "$no_pam" -a "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then 233if (test -z "$no_pam" && test "x$ac_cv_header_security_pam_appl_h" = "xyes") ; then
234 AC_CHECK_LIB(dl, dlopen, , ) 234 AC_CHECK_LIB(dl, dlopen, , )
235 LIBS="$LIBS -lpam" 235 LIBS="$LIBS -lpam"
236 236
@@ -321,7 +321,7 @@ int main(void)
321 ac_cv_openssldir=$ssldir 321 ac_cv_openssldir=$ssldir
322]) 322])
323 323
324if test ! -z "$ac_cv_openssldir" -a ! "x$ac_cv_openssldir" = "x(system)" ; then 324if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then
325 AC_DEFINE(HAVE_OPENSSL) 325 AC_DEFINE(HAVE_OPENSSL)
326 dnl Need to recover ssldir - test above runs in subshell 326 dnl Need to recover ssldir - test above runs in subshell
327 ssldir=$ac_cv_openssldir 327 ssldir=$ac_cv_openssldir
@@ -421,8 +421,8 @@ if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
421fi 421fi
422 422
423 423
424if test -z "$have_u_intxx_t" -o -z "$have_intxx_t" -a \ 424if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
425 "x$ac_cv_header_sys_bitypes_h" = "xyes" 425 test "x$ac_cv_header_sys_bitypes_h" = "xyes")
426then 426then
427 AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h]) 427 AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h])
428 AC_TRY_COMPILE( 428 AC_TRY_COMPILE(
@@ -679,7 +679,7 @@ AC_ARG_WITH(xauth,
679 ], 679 ],
680 [ 680 [
681 AC_PATH_PROG(xauth_path, xauth) 681 AC_PATH_PROG(xauth_path, xauth)
682 if test ! -z "$xauth_path" -a -x "/usr/openwin/bin/xauth" ; then 682 if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then
683 xauth_path="/usr/openwin/bin/xauth" 683 xauth_path="/usr/openwin/bin/xauth"
684 fi 684 fi
685 ] 685 ]
@@ -750,7 +750,7 @@ AC_ARG_WITH(egd-pool,
750# detect pathnames for entropy gathering commands, if we need them 750# detect pathnames for entropy gathering commands, if we need them
751INSTALL_SSH_PRNG_CMDS="" 751INSTALL_SSH_PRNG_CMDS=""
752rm -f prng_commands 752rm -f prng_commands
753if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then 753if (test -z "$RANDOM_POOL" && test -z "$EGD_SOCKET") ; then
754 # Use these commands to collect entropy 754 # Use these commands to collect entropy
755 OSSH_PATH_ENTROPY_PROG(PROG_LS, ls) 755 OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
756 OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat) 756 OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
@@ -1077,7 +1077,7 @@ AC_TRY_COMPILE([
1077if test -z "$conf_lastlog_location"; then 1077if test -z "$conf_lastlog_location"; then
1078 if test x"$system_lastlog_path" = x"no" ; then 1078 if test x"$system_lastlog_path" = x"no" ; then
1079 for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do 1079 for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do
1080 if test -d "$f" -o -f "$f" ; then 1080 if (test -d "$f" || test -f "$f") ; then
1081 conf_lastlog_location=$f 1081 conf_lastlog_location=$f
1082 fi 1082 fi
1083 done 1083 done