--- configure.ac.orig 2002-09-25 17:38:47.000000000 -0700 +++ configure.ac 2003-03-26 12:17:05.000000000 -0800 @@ -504,7 +504,8 @@ [ AC_MSG_RESULT(no) AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) - ] + ], + [AC_MSG_RESULT(yes)] ) # Check whether user wants S/Key support @@ -535,7 +536,12 @@ [ AC_MSG_RESULT(no) AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) - ]) + ], + [ + AC_MSG_RESULT(no) + AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) + ]) + fi ] ) @@ -632,6 +638,7 @@ } ], [ ac_cv_have_broken_dirname="no" ], + [ ac_cv_have_broken_dirname="yes" ], [ ac_cv_have_broken_dirname="yes" ] ) LIBS="$save_LIBS" @@ -676,7 +683,8 @@ AC_MSG_RESULT(no) AC_DEFINE(BROKEN_SNPRINTF) AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) - ] + ], + [AC_MSG_RESULT(yes)] ) fi @@ -810,7 +818,10 @@ [ AC_MSG_RESULT(not found) AC_MSG_ERROR(OpenSSL version header not found.) - ] + ], + [ + AC_MSG_RESULT(OpenSSL headers should be OK) + ] ) # Determine OpenSSL library version @@ -843,7 +854,11 @@ [ AC_MSG_RESULT(not found) AC_MSG_ERROR(OpenSSL library not found.) - ] + ], + [ + AC_MSG_RESULT(expected to be OK) + ] + ) # Sanity check OpenSSL headers @@ -860,7 +875,10 @@ [ AC_MSG_RESULT(no) AC_MSG_ERROR(Your OpenSSL headers do not match your library) - ] + ], + [ + AC_MSG_RESULT(yes) + ] ) # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the @@ -889,7 +907,11 @@ # Default to use of the rand helper if OpenSSL doesn't # seed itself USE_RAND_HELPER=yes - ] + ], + [ + OPENSSL_SEEDS_ITSELF=yes + AC_MSG_RESULT(yes) + ] ) @@ -1475,7 +1497,7 @@ #else main() { exit(0); } #endif - ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ] + ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ], [ true ] ) fi AC_SUBST(NO_SFTP) @@ -1596,6 +1618,7 @@ } ], [ ac_cv_have_accrights_in_msghdr="yes" ], + [ ac_cv_have_accrights_in_msghdr="no" ], [ ac_cv_have_accrights_in_msghdr="no" ] ) ]) @@ -1620,7 +1643,8 @@ } ], [ ac_cv_have_control_in_msghdr="yes" ], - [ ac_cv_have_control_in_msghdr="no" ] + [ ac_cv_have_control_in_msghdr="no" ], + [ ac_cv_have_control_in_msghdr="yes" ] ) ]) if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then @@ -1923,20 +1947,17 @@ if test -z "$no_dev_ptmx" ; then if test "x$disable_ptmx_check" != "xyes" ; then - AC_CHECK_FILE("/dev/ptmx", - [ + if test -f "/dev/ptmx"; then AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX) have_dev_ptmx=1 - ] - ) + fi fi fi -AC_CHECK_FILE("/dev/ptc", - [ - AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC) - have_dev_ptc=1 - ] -) + +if test -f "/dev/ptc" ; then + AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC) + have_dev_ptc=1 +fi # Options from here on. Some of these are preset by platform above AC_ARG_WITH(mantype, @@ -2083,6 +2104,7 @@ } ], [ user_path=`cat conftest.stdpath` ], [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ], + [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ], [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ] ) # make sure $bindir is in USER_PATH so scp will work