From e9b171e0738c2acef0650328b7f2e1ae7cdc55cc Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 21 Nov 2003 18:27:14 +0000 Subject: Numerous build fixes from an oemake -a run, including two more fixes for libtool 'libdir from .la file leaking into library search path' situations. BKrev: 3fbe5902eywlLRHkRQ1FaDS5C01-jg --- openssh/openssh-3.7.1p1/configure.patch | 23706 ++++++++++++++++++++++++++++++ 1 file changed, 23706 insertions(+) (limited to 'openssh') diff --git a/openssh/openssh-3.7.1p1/configure.patch b/openssh/openssh-3.7.1p1/configure.patch index e69de29bb2..35629028cc 100644 --- a/openssh/openssh-3.7.1p1/configure.patch +++ b/openssh/openssh-3.7.1p1/configure.patch @@ -0,0 +1,23706 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- openssh-3.7.1p1/configure.ac~configure ++++ openssh-3.7.1p1/configure.ac +@@ -65,7 +65,7 @@ + for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do + if (test -z "$blibflags"); then + LDFLAGS="$saved_LDFLAGS $tryflags$blibpath" +- AC_TRY_LINK([], [], [blibflags=$tryflags]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[blibflags=$tryflags],[]) + fi + done + if (test -z "$blibflags"); then +@@ -85,13 +85,9 @@ + dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2) + AC_CHECK_DECL(loginfailed, + [AC_MSG_CHECKING(if loginfailed takes 4 arguments) +- AC_TRY_COMPILE( +- [#include ], +- [(void)loginfailed("user","host","tty",0);], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(AIX_LOGINFAILED_4ARG)], +- [AC_MSG_RESULT(no)] +- )], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[(void)loginfailed("user","host","tty",0);]])],[AC_MSG_RESULT(yes) ++ AC_DEFINE(AIX_LOGINFAILED_4ARG)],[AC_MSG_RESULT(no) ++ ])], + [], + [#include ] + ) +@@ -123,15 +119,13 @@ + ;; + *-*-darwin*) + AC_MSG_CHECKING(if we have working getaddrinfo) +- AC_TRY_RUN([#include ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + exit(0); + else + exit(1); +-}], [AC_MSG_RESULT(working)], +- [AC_MSG_RESULT(buggy) +- AC_DEFINE(BROKEN_GETADDRINFO)], +- [AC_MSG_RESULT(assume it is working)]) ++}]])],[AC_MSG_RESULT(working)],[AC_MSG_RESULT(buggy) ++ AC_DEFINE(BROKEN_GETADDRINFO)],[AC_MSG_RESULT(assume it is working)]) + ;; + *-*-hpux10.26) + if test -z "$GCC"; then +@@ -442,16 +436,14 @@ + ) + + AC_MSG_CHECKING(compiler and flags for sanity) +-AC_TRY_RUN([ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + int main(){exit(0);} +- ], +- [ AC_MSG_RESULT(yes) ], +- [ ++ ]])],[ AC_MSG_RESULT(yes) ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***]) +- ] +-) ++ ],[ AC_MSG_RESULT(yes) ++]) + + # Checks for header files. + AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \ +@@ -483,8 +475,7 @@ + ac_cv_have_broken_dirname, [ + save_LIBS="$LIBS" + LIBS="$LIBS -lgen" +- AC_TRY_RUN( +- [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + +@@ -499,10 +490,8 @@ + exit(0); + } + } +- ], +- [ ac_cv_have_broken_dirname="no" ], +- [ ac_cv_have_broken_dirname="yes" ] +- ) ++ ]])],[ ac_cv_have_broken_dirname="no" ],[ ac_cv_have_broken_dirname="yes" ++ ],[]) + LIBS="$save_LIBS" + ]) + if test "x$ac_cv_have_broken_dirname" = "xno" ; then +@@ -609,19 +598,18 @@ + ] + ) + +-AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) +-AC_TRY_RUN( +- [ +-#include +-#include +-int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} +- ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) +- ] +-) ++AC_CACHE_CHECK([whether struct dirent allocates space for d_name], ac_cv_have_space_d_name_in_struct_dirent, [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ #include ++ #include ++ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} ++ ]])],[ac_cv_have_space_d_name_in_struct_dirent="yes"],[ac_cv_have_space_d_name_in_struct_dirent="no" ++ ],[]) ++]) ++ ++if test "x$ac_cv_dirent_have_space_d_name" = "xyes" ; then ++ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) ++fi + + # Check whether user wants S/Key support + SKEY_MSG="no" +@@ -641,17 +629,14 @@ + SKEY_MSG="yes" + + AC_MSG_CHECKING([for s/key support]) +- AC_TRY_RUN( +- [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); } +- ], +- [AC_MSG_RESULT(yes)], +- [ ++ ]])],[AC_MSG_RESULT(yes)],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) +- ]) ++ ],[]) + fi + ] + ) +@@ -689,22 +674,18 @@ + LIBWRAP="-lwrap" + LIBS="$LIBWRAP $LIBS" + AC_MSG_CHECKING(for libwrap) +- AC_TRY_LINK( +- [ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include + int deny_severity = 0, allow_severity = 0; +- ], +- [hosts_access(0);], +- [ ++ ]], [[hosts_access(0);]])],[ + AC_MSG_RESULT(yes) + AC_DEFINE(LIBWRAP) + AC_SUBST(LIBWRAP) + TCPW_MSG="yes" +- ], +- [ ++ ],[ + AC_MSG_ERROR([*** libwrap missing]) +- ] +- ) ++ ++ ]) + LIBS="$saved_LIBS" + fi + ] +@@ -760,52 +741,47 @@ + + # Check for broken snprintf + if test "x$ac_cv_func_snprintf" = "xyes" ; then +- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) +- AC_TRY_RUN( +- [ ++AC_CACHE_CHECK([whether snprintf correctly terminates long strings], ++ ac_cv_have_broken_snprintf, [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} +- ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_SNPRINTF) +- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) +- ] +- ) ++ ]])],[ ac_cv_have_broken_snprintf="no" ],[ ac_cv_have_broken_snprintf="yes" ++ ],[]) ++]) ++if test "x$ac_cv_have_broken_snprintf" = "xyes" ; then ++ AC_DEFINE(BROKEN_SNPRINTF) ++ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) ++fi + fi + + dnl see whether mkstemp() requires XXXXXX + if test "x$ac_cv_func_mkdtemp" = "xyes" ; then + AC_MSG_CHECKING([for (overly) strict mkstemp]) +-AC_TRY_RUN( +- [ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + main() { char template[]="conftest.mkstemp-test"; + if (mkstemp(template) == -1) + exit(1); + unlink(template); exit(0); + } +- ], +- [ ++ ]])],[ + AC_MSG_RESULT(no) +- ], +- [ ++ ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STRICT_MKSTEMP) +- ], +- [ ++ ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STRICT_MKSTEMP) +- ] +-) ++ ++]) + fi + + dnl make sure that openpty does not reacquire controlling terminal + if test ! -z "$check_for_openpty_ctty_bug"; then +- AC_MSG_CHECKING(if openpty correctly handles controlling tty) +- AC_TRY_RUN( +- [ ++AC_CACHE_CHECK([if openpty acquires controlling terminal], ++ ac_cv_have_openpty_ctty_bug, [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include +@@ -837,15 +813,12 @@ + exit(0); /* Did not acquire ctty: OK */ + } + } +- ], +- [ +- AC_MSG_RESULT(yes) +- ], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(SSHD_ACQUIRES_CTTY) +- ] +- ) ++ ]])],[ ac_cv_have_openpty_ctty_bug="no" ],[ ac_cv_have_openpty_ctty_bug="yes" ++ ],[]) ++]) ++if test "x$ac_cv_have_openpty_ctty_bug" = "xyes" ; then ++ AC_DEFINE(SSHD_ACQUIRES_CTTY) ++fi + fi + + AC_FUNC_GETPGRP +@@ -883,19 +856,15 @@ + if test "x$PAM_MSG" = "xyes" ; then + # Check PAM strerror arguments (old PAM) + AC_MSG_CHECKING([whether pam_strerror takes only one argument]) +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [(void)pam_strerror((pam_handle_t *)NULL, -1);], +- [AC_MSG_RESULT(no)], +- [ ++ ]], [[(void)pam_strerror((pam_handle_t *)NULL, -1);]])],[AC_MSG_RESULT(no)],[ + AC_DEFINE(HAVE_OLD_PAM) + AC_MSG_RESULT(yes) + PAM_MSG="yes (old library)" +- ] +- ) ++ ++ ]) + fi + + # Some systems want crypt() from libcrypt, *not* the version in OpenSSL, +@@ -952,8 +921,7 @@ + + # Determine OpenSSL header version + AC_MSG_CHECKING([OpenSSL header version]) +-AC_TRY_RUN( +- [ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include +@@ -971,21 +939,21 @@ + + exit(0); + } +- ], +- [ ++ ]])],[ + ssl_header_ver=`cat conftest.sslincver` + AC_MSG_RESULT($ssl_header_ver) +- ], +- [ ++ ],[ + AC_MSG_RESULT(not found) + AC_MSG_ERROR(OpenSSL version header not found.) +- ] +-) ++ ],[ ++ AC_MSG_RESULT(unknown) ++ AC_MSG_WARN(Skipping OpenSSL header version check due to crosscompilation.) ++ ++]) + + # Determine OpenSSL library version + AC_MSG_CHECKING([OpenSSL library version]) +-AC_TRY_RUN( +- [ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include +@@ -1004,35 +972,36 @@ + + exit(0); + } +- ], +- [ ++ ]])],[ + ssl_library_ver=`cat conftest.ssllibver` + AC_MSG_RESULT($ssl_library_ver) +- ], +- [ ++ ],[ + AC_MSG_RESULT(not found) + AC_MSG_ERROR(OpenSSL library not found.) +- ] +-) ++ ],[ ++ AC_MSG_RESULT(unknown) ++ AC_MSG_WARN(Skipping OpenSSL library version check due to crosscompilation.) ++ ++]) + + # Sanity check OpenSSL headers + AC_MSG_CHECKING([whether OpenSSL's headers match the library]) +-AC_TRY_RUN( +- [ ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } +- ], +- [ ++ ]])],[ + AC_MSG_RESULT(yes) +- ], +- [ ++ ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([Your OpenSSL headers do not match your library. + Check config.log for details. + Also see contrib/findssl.sh for help identifying header/library mismatches.]) +- ] +-) ++ ],[ ++ AC_MSG_RESULT(unknown) ++ AC_MSG_WARN(Skipping OpenSSL version comparison due to crosscompilation.) ++ ++]) + + # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the + # version in OpenSSL. Skip this for PAM +@@ -1040,30 +1009,8 @@ + AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt") + fi + +- + ### Configure cryptographic random number support + +-# Check wheter OpenSSL seeds itself +-AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded]) +-AC_TRY_RUN( +- [ +-#include +-#include +-int main(void) { exit(RAND_status() == 1 ? 0 : 1); } +- ], +- [ +- OPENSSL_SEEDS_ITSELF=yes +- AC_MSG_RESULT(yes) +- ], +- [ +- AC_MSG_RESULT(no) +- # Default to use of the rand helper if OpenSSL doesn't +- # seed itself +- USE_RAND_HELPER=yes +- ] +-) +- +- + # Do we want to force the use of the rand helper? + AC_ARG_WITH(rand-helper, + [ --with-rand-helper Use subprocess to gather strong randomness ], +@@ -1080,6 +1027,24 @@ + USE_RAND_HELPER=yes + fi + ], ++ # Check whether OpenSSL seeds itself ++ [ ++ AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded]) ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ #include ++ #include ++ int main(void) { exit(RAND_status() == 1 ? 0 : 1); } ++ ]])],[ ++ OPENSSL_SEEDS_ITSELF=yes ++ AC_MSG_RESULT(yes) ++ ],[ ++ AC_MSG_RESULT(no) ++ # Default to use of the rand helper if OpenSSL doesn't ++ # seed itself ++ USE_RAND_HELPER=yes ++ ++ ],[]) ++ ] + ) + + # Which randomness source do we use? +@@ -1261,12 +1226,8 @@ + + # More checks for data types + AC_CACHE_CHECK([for u_int type], ac_cv_have_u_int, [ +- AC_TRY_COMPILE( +- [ #include ], +- [ u_int a; a = 1;], +- [ ac_cv_have_u_int="yes" ], +- [ ac_cv_have_u_int="no" ] +- ) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ u_int a; a = 1;]])],[ ac_cv_have_u_int="yes" ],[ ac_cv_have_u_int="no" ++ ]) + ]) + if test "x$ac_cv_have_u_int" = "xyes" ; then + AC_DEFINE(HAVE_U_INT) +@@ -1274,12 +1235,8 @@ + fi + + AC_CACHE_CHECK([for intXX_t types], ac_cv_have_intxx_t, [ +- AC_TRY_COMPILE( +- [ #include ], +- [ int8_t a; int16_t b; int32_t c; a = b = c = 1;], +- [ ac_cv_have_intxx_t="yes" ], +- [ ac_cv_have_intxx_t="no" ] +- ) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ int8_t a; int16_t b; int32_t c; a = b = c = 1;]])],[ ac_cv_have_intxx_t="yes" ],[ ac_cv_have_intxx_t="no" ++ ]) + ]) + if test "x$ac_cv_have_intxx_t" = "xyes" ; then + AC_DEFINE(HAVE_INTXX_T) +@@ -1290,20 +1247,15 @@ + test "x$ac_cv_header_stdint_h" = "xyes") + then + AC_MSG_CHECKING([for intXX_t types in stdint.h]) +- AC_TRY_COMPILE( +- [ #include ], +- [ int8_t a; int16_t b; int32_t c; a = b = c = 1;], +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ int8_t a; int16_t b; int32_t c; a = b = c = 1;]])],[ + AC_DEFINE(HAVE_INTXX_T) + AC_MSG_RESULT(yes) +- ], +- [ AC_MSG_RESULT(no) ] +- ) ++ ],[ AC_MSG_RESULT(no) ++ ]) + fi + + AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #ifdef HAVE_STDINT_H + # include +@@ -1312,23 +1264,16 @@ + #ifdef HAVE_SYS_BITYPES_H + # include + #endif +- ], +- [ int64_t a; a = 1;], +- [ ac_cv_have_int64_t="yes" ], +- [ ac_cv_have_int64_t="no" ] +- ) ++ ]], [[ int64_t a; a = 1;]])],[ ac_cv_have_int64_t="yes" ],[ ac_cv_have_int64_t="no" ++ ]) + ]) + if test "x$ac_cv_have_int64_t" = "xyes" ; then + AC_DEFINE(HAVE_INT64_T) + fi + + AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ +- AC_TRY_COMPILE( +- [ #include ], +- [ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], +- [ ac_cv_have_u_intxx_t="yes" ], +- [ ac_cv_have_u_intxx_t="no" ] +- ) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;]])],[ ac_cv_have_u_intxx_t="yes" ],[ ac_cv_have_u_intxx_t="no" ++ ]) + ]) + if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then + AC_DEFINE(HAVE_U_INTXX_T) +@@ -1337,24 +1282,16 @@ + + if test -z "$have_u_intxx_t" ; then + AC_MSG_CHECKING([for u_intXX_t types in sys/socket.h]) +- AC_TRY_COMPILE( +- [ #include ], +- [ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;]])],[ + AC_DEFINE(HAVE_U_INTXX_T) + AC_MSG_RESULT(yes) +- ], +- [ AC_MSG_RESULT(no) ] +- ) ++ ],[ AC_MSG_RESULT(no) ++ ]) + fi + + AC_CACHE_CHECK([for u_int64_t types], ac_cv_have_u_int64_t, [ +- AC_TRY_COMPILE( +- [ #include ], +- [ u_int64_t a; a = 1;], +- [ ac_cv_have_u_int64_t="yes" ], +- [ ac_cv_have_u_int64_t="no" ] +- ) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ u_int64_t a; a = 1;]])],[ ac_cv_have_u_int64_t="yes" ],[ ac_cv_have_u_int64_t="no" ++ ]) + ]) + if test "x$ac_cv_have_u_int64_t" = "xyes" ; then + AC_DEFINE(HAVE_U_INT64_T) +@@ -1363,27 +1300,19 @@ + + if test -z "$have_u_int64_t" ; then + AC_MSG_CHECKING([for u_int64_t type in sys/bitypes.h]) +- AC_TRY_COMPILE( +- [ #include ], +- [ u_int64_t a; a = 1], +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ u_int64_t a; a = 1]])],[ + AC_DEFINE(HAVE_U_INT64_T) + AC_MSG_RESULT(yes) +- ], +- [ AC_MSG_RESULT(no) ] +- ) ++ ],[ AC_MSG_RESULT(no) ++ ]) + fi + + if test -z "$have_u_intxx_t" ; then + AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ], +- [ ac_cv_have_uintxx_t="yes" ], +- [ ac_cv_have_uintxx_t="no" ] +- ) ++ ]], [[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ]])],[ ac_cv_have_uintxx_t="yes" ],[ ac_cv_have_uintxx_t="no" ++ ]) + ]) + if test "x$ac_cv_have_uintxx_t" = "xyes" ; then + AC_DEFINE(HAVE_UINTXX_T) +@@ -1392,49 +1321,37 @@ + + if test -z "$have_uintxx_t" ; then + AC_MSG_CHECKING([for uintXX_t types in stdint.h]) +- AC_TRY_COMPILE( +- [ #include ], +- [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;], +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;]])],[ + AC_DEFINE(HAVE_UINTXX_T) + AC_MSG_RESULT(yes) +- ], +- [ AC_MSG_RESULT(no) ] +- ) ++ ],[ AC_MSG_RESULT(no) ++ ]) + fi + + if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ + test "x$ac_cv_header_sys_bitypes_h" = "xyes") + then + AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h]) +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ ++ ]], [[ + int8_t a; int16_t b; int32_t c; + u_int8_t e; u_int16_t f; u_int32_t g; + a = b = c = e = f = g = 1; +- ], +- [ ++ ]])],[ + AC_DEFINE(HAVE_U_INTXX_T) + AC_DEFINE(HAVE_INTXX_T) + AC_MSG_RESULT(yes) +- ], +- [AC_MSG_RESULT(no)] +- ) ++ ],[AC_MSG_RESULT(no) ++ ]) + fi + + + AC_CACHE_CHECK([for u_char], ac_cv_have_u_char, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ u_char foo; foo = 125; ], +- [ ac_cv_have_u_char="yes" ], +- [ ac_cv_have_u_char="no" ] +- ) ++ ]], [[ u_char foo; foo = 125; ]])],[ ac_cv_have_u_char="yes" ],[ ac_cv_have_u_char="no" ++ ]) + ]) + if test "x$ac_cv_have_u_char" = "xyes" ; then + AC_DEFINE(HAVE_U_CHAR) +@@ -1445,56 +1362,40 @@ + AC_CHECK_TYPES(sig_atomic_t,,,[#include ]) + + AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ size_t foo; foo = 1235; ], +- [ ac_cv_have_size_t="yes" ], +- [ ac_cv_have_size_t="no" ] +- ) ++ ]], [[ size_t foo; foo = 1235; ]])],[ ac_cv_have_size_t="yes" ],[ ac_cv_have_size_t="no" ++ ]) + ]) + if test "x$ac_cv_have_size_t" = "xyes" ; then + AC_DEFINE(HAVE_SIZE_T) + fi + + AC_CACHE_CHECK([for ssize_t], ac_cv_have_ssize_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ ssize_t foo; foo = 1235; ], +- [ ac_cv_have_ssize_t="yes" ], +- [ ac_cv_have_ssize_t="no" ] +- ) ++ ]], [[ ssize_t foo; foo = 1235; ]])],[ ac_cv_have_ssize_t="yes" ],[ ac_cv_have_ssize_t="no" ++ ]) + ]) + if test "x$ac_cv_have_ssize_t" = "xyes" ; then + AC_DEFINE(HAVE_SSIZE_T) + fi + + AC_CACHE_CHECK([for clock_t], ac_cv_have_clock_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ clock_t foo; foo = 1235; ], +- [ ac_cv_have_clock_t="yes" ], +- [ ac_cv_have_clock_t="no" ] +- ) ++ ]], [[ clock_t foo; foo = 1235; ]])],[ ac_cv_have_clock_t="yes" ],[ ac_cv_have_clock_t="no" ++ ]) + ]) + if test "x$ac_cv_have_clock_t" = "xyes" ; then + AC_DEFINE(HAVE_CLOCK_T) + fi + + AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [ sa_family_t foo; foo = 1235; ], +- [ ac_cv_have_sa_family_t="yes" ], +- [ AC_TRY_COMPILE( ++ ]], [[ sa_family_t foo; foo = 1235; ]])],[ ac_cv_have_sa_family_t="yes" ],[ AC_TRY_COMPILE( + [ + #include + #include +@@ -1504,36 +1405,28 @@ + [ ac_cv_have_sa_family_t="yes" ], + + [ ac_cv_have_sa_family_t="no" ] +- )] + ) ++ ]) + ]) + if test "x$ac_cv_have_sa_family_t" = "xyes" ; then + AC_DEFINE(HAVE_SA_FAMILY_T) + fi + + AC_CACHE_CHECK([for pid_t], ac_cv_have_pid_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ pid_t foo; foo = 1235; ], +- [ ac_cv_have_pid_t="yes" ], +- [ ac_cv_have_pid_t="no" ] +- ) ++ ]], [[ pid_t foo; foo = 1235; ]])],[ ac_cv_have_pid_t="yes" ],[ ac_cv_have_pid_t="no" ++ ]) + ]) + if test "x$ac_cv_have_pid_t" = "xyes" ; then + AC_DEFINE(HAVE_PID_T) + fi + + AC_CACHE_CHECK([for mode_t], ac_cv_have_mode_t, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ mode_t foo; foo = 1235; ], +- [ ac_cv_have_mode_t="yes" ], +- [ ac_cv_have_mode_t="no" ] +- ) ++ ]], [[ mode_t foo; foo = 1235; ]])],[ ac_cv_have_mode_t="yes" ],[ ac_cv_have_mode_t="no" ++ ]) + ]) + if test "x$ac_cv_have_mode_t" = "xyes" ; then + AC_DEFINE(HAVE_MODE_T) +@@ -1541,73 +1434,53 @@ + + + AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [ struct sockaddr_storage s; ], +- [ ac_cv_have_struct_sockaddr_storage="yes" ], +- [ ac_cv_have_struct_sockaddr_storage="no" ] +- ) ++ ]], [[ struct sockaddr_storage s; ]])],[ ac_cv_have_struct_sockaddr_storage="yes" ],[ ac_cv_have_struct_sockaddr_storage="no" ++ ]) + ]) + if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then + AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE) + fi + + AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [ struct sockaddr_in6 s; s.sin6_family = 0; ], +- [ ac_cv_have_struct_sockaddr_in6="yes" ], +- [ ac_cv_have_struct_sockaddr_in6="no" ] +- ) ++ ]], [[ struct sockaddr_in6 s; s.sin6_family = 0; ]])],[ ac_cv_have_struct_sockaddr_in6="yes" ],[ ac_cv_have_struct_sockaddr_in6="no" ++ ]) + ]) + if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then + AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6) + fi + + AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [ struct in6_addr s; s.s6_addr[0] = 0; ], +- [ ac_cv_have_struct_in6_addr="yes" ], +- [ ac_cv_have_struct_in6_addr="no" ] +- ) ++ ]], [[ struct in6_addr s; s.s6_addr[0] = 0; ]])],[ ac_cv_have_struct_in6_addr="yes" ],[ ac_cv_have_struct_in6_addr="no" ++ ]) + ]) + if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then + AC_DEFINE(HAVE_STRUCT_IN6_ADDR) + fi + + AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #include +- ], +- [ struct addrinfo s; s.ai_flags = AI_PASSIVE; ], +- [ ac_cv_have_struct_addrinfo="yes" ], +- [ ac_cv_have_struct_addrinfo="no" ] +- ) ++ ]], [[ struct addrinfo s; s.ai_flags = AI_PASSIVE; ]])],[ ac_cv_have_struct_addrinfo="yes" ],[ ac_cv_have_struct_addrinfo="no" ++ ]) + ]) + if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then + AC_DEFINE(HAVE_STRUCT_ADDRINFO) + fi + + AC_CACHE_CHECK([for struct timeval], ac_cv_have_struct_timeval, [ +- AC_TRY_COMPILE( +- [ #include ], +- [ struct timeval tv; tv.tv_sec = 1;], +- [ ac_cv_have_struct_timeval="yes" ], +- [ ac_cv_have_struct_timeval="no" ] +- ) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ struct timeval tv; tv.tv_sec = 1;]])],[ ac_cv_have_struct_timeval="yes" ],[ ac_cv_have_struct_timeval="no" ++ ]) + ]) + if test "x$ac_cv_have_struct_timeval" = "xyes" ; then + AC_DEFINE(HAVE_STRUCT_TIMEVAL) +@@ -1626,32 +1499,42 @@ + exit 1; + else + dnl test snprintf (broken on SCO w/gcc) +- AC_TRY_RUN( +- [ +-#include +-#include +-#ifdef HAVE_SNPRINTF +-main() +-{ +- char buf[50]; +- char expected_out[50]; +- int mazsize = 50 ; +-#if (SIZEOF_LONG_INT == 8) +- long int num = 0x7fffffffffffffff; +-#else +- long long num = 0x7fffffffffffffffll; +-#endif +- strcpy(expected_out, "9223372036854775807"); +- snprintf(buf, mazsize, "%lld", num); +- if(strcmp(buf, expected_out) != 0) +- exit(1); +- exit(0); +-} +-#else +-main() { exit(0); } +-#endif +- ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ] +- ) ++ if test "x$ac_cv_have_broken_snprintf" != "xyes" ; then ++# no need to test again if we already know its broken :) ++ AC_CACHE_CHECK([whether snprintf is broken], ++ ac_cv_have_broken_snprintf, [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ #include ++ #include ++ #ifdef HAVE_SNPRINTF ++ main() ++ { ++ char buf[50]; ++ char expected_out[50]; ++ int mazsize = 50 ; ++ #if (SIZEOF_LONG_INT == 8) ++ long int num = 0x7fffffffffffffff; ++ #else ++ long long num = 0x7fffffffffffffffll; ++ #endif ++ strcpy(expected_out, "9223372036854775807"); ++ snprintf(buf, mazsize, "%lld", num); ++ if(strcmp(buf, expected_out) != 0) ++ exit(1); ++ exit(0); ++ } ++ #else ++ main() { exit(0); } ++ #endif ++ ]])],[ true ],[ ++ ac_cv_have_broken_snprintf="yes" ++ ++ ],[]) ++ ]) ++ if test "x$ac_cv_have_broken_snprintf" = "xyes" ; then ++ AC_DEFINE(BROKEN_SNPRINTF) ++ fi ++ fi + fi + + dnl Checks for structure members +@@ -1677,15 +1560,10 @@ + + AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage], + ac_cv_have_ss_family_in_struct_ss, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [ struct sockaddr_storage s; s.ss_family = 1; ], +- [ ac_cv_have_ss_family_in_struct_ss="yes" ], +- [ ac_cv_have_ss_family_in_struct_ss="no" ], +- ) ++ ]], [[ struct sockaddr_storage s; s.ss_family = 1; ]])],[ ac_cv_have_ss_family_in_struct_ss="yes" ],[ ac_cv_have_ss_family_in_struct_ss="no" ]) + ]) + if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then + AC_DEFINE(HAVE_SS_FAMILY_IN_SS) +@@ -1693,15 +1571,11 @@ + + AC_CACHE_CHECK([for __ss_family field in struct sockaddr_storage], + ac_cv_have___ss_family_in_struct_ss, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include +- ], +- [ struct sockaddr_storage s; s.__ss_family = 1; ], +- [ ac_cv_have___ss_family_in_struct_ss="yes" ], +- [ ac_cv_have___ss_family_in_struct_ss="no" ] +- ) ++ ]], [[ struct sockaddr_storage s; s.__ss_family = 1; ]])],[ ac_cv_have___ss_family_in_struct_ss="yes" ],[ ac_cv_have___ss_family_in_struct_ss="no" ++ ]) + ]) + if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then + AC_DEFINE(HAVE___SS_FAMILY_IN_SS) +@@ -1709,14 +1583,10 @@ + + AC_CACHE_CHECK([for pw_class field in struct passwd], + ac_cv_have_pw_class_in_struct_passwd, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ struct passwd p; p.pw_class = 0; ], +- [ ac_cv_have_pw_class_in_struct_passwd="yes" ], +- [ ac_cv_have_pw_class_in_struct_passwd="no" ] +- ) ++ ]], [[ struct passwd p; p.pw_class = 0; ]])],[ ac_cv_have_pw_class_in_struct_passwd="yes" ],[ ac_cv_have_pw_class_in_struct_passwd="no" ++ ]) + ]) + if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then + AC_DEFINE(HAVE_PW_CLASS_IN_PASSWD) +@@ -1724,14 +1594,10 @@ + + AC_CACHE_CHECK([for pw_expire field in struct passwd], + ac_cv_have_pw_expire_in_struct_passwd, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ struct passwd p; p.pw_expire = 0; ], +- [ ac_cv_have_pw_expire_in_struct_passwd="yes" ], +- [ ac_cv_have_pw_expire_in_struct_passwd="no" ] +- ) ++ ]], [[ struct passwd p; p.pw_expire = 0; ]])],[ ac_cv_have_pw_expire_in_struct_passwd="yes" ],[ ac_cv_have_pw_expire_in_struct_passwd="no" ++ ]) + ]) + if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then + AC_DEFINE(HAVE_PW_EXPIRE_IN_PASSWD) +@@ -1739,14 +1605,10 @@ + + AC_CACHE_CHECK([for pw_change field in struct passwd], + ac_cv_have_pw_change_in_struct_passwd, [ +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ struct passwd p; p.pw_change = 0; ], +- [ ac_cv_have_pw_change_in_struct_passwd="yes" ], +- [ ac_cv_have_pw_change_in_struct_passwd="no" ] +- ) ++ ]], [[ struct passwd p; p.pw_change = 0; ]])],[ ac_cv_have_pw_change_in_struct_passwd="yes" ],[ ac_cv_have_pw_change_in_struct_passwd="no" ++ ]) + ]) + if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then + AC_DEFINE(HAVE_PW_CHANGE_IN_PASSWD) +@@ -1755,8 +1617,7 @@ + dnl make sure we're using the real structure members and not defines + AC_CACHE_CHECK([for msg_accrights field in struct msghdr], + ac_cv_have_accrights_in_msghdr, [ +- AC_TRY_RUN( +- [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include +@@ -1768,10 +1629,8 @@ + m.msg_accrights = 0; + exit(0); + } +- ], +- [ ac_cv_have_accrights_in_msghdr="yes" ], +- [ ac_cv_have_accrights_in_msghdr="no" ] +- ) ++ ]])],[ ac_cv_have_accrights_in_msghdr="yes" ],[ ac_cv_have_accrights_in_msghdr="no" ++ ],[]) + ]) + if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then + AC_DEFINE(HAVE_ACCRIGHTS_IN_MSGHDR) +@@ -1779,8 +1638,7 @@ + + AC_CACHE_CHECK([for msg_control field in struct msghdr], + ac_cv_have_control_in_msghdr, [ +- AC_TRY_RUN( +- [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include + #include +@@ -1792,47 +1650,36 @@ + m.msg_control = 0; + exit(0); + } +- ], +- [ ac_cv_have_control_in_msghdr="yes" ], +- [ ac_cv_have_control_in_msghdr="no" ] +- ) ++ ]])],[ ac_cv_have_control_in_msghdr="yes" ],[ ac_cv_have_control_in_msghdr="no" ++ ],[]) + ]) + if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then + AC_DEFINE(HAVE_CONTROL_IN_MSGHDR) + fi + + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ +- AC_TRY_LINK([], +- [ extern char *__progname; printf("%s", __progname); ], +- [ ac_cv_libc_defines___progname="yes" ], +- [ ac_cv_libc_defines___progname="no" ] +- ) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern char *__progname; printf("%s", __progname); ]])],[ ac_cv_libc_defines___progname="yes" ],[ ac_cv_libc_defines___progname="no" ++ ]) + ]) + if test "x$ac_cv_libc_defines___progname" = "xyes" ; then + AC_DEFINE(HAVE___PROGNAME) + fi + + AC_CACHE_CHECK([whether $CC implements __FUNCTION__], ac_cv_cc_implements___FUNCTION__, [ +- AC_TRY_LINK([ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-], +- [ printf("%s", __FUNCTION__); ], +- [ ac_cv_cc_implements___FUNCTION__="yes" ], +- [ ac_cv_cc_implements___FUNCTION__="no" ] +- ) ++]], [[ printf("%s", __FUNCTION__); ]])],[ ac_cv_cc_implements___FUNCTION__="yes" ],[ ac_cv_cc_implements___FUNCTION__="no" ++ ]) + ]) + if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then + AC_DEFINE(HAVE___FUNCTION__) + fi + + AC_CACHE_CHECK([whether $CC implements __func__], ac_cv_cc_implements___func__, [ +- AC_TRY_LINK([ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-], +- [ printf("%s", __func__); ], +- [ ac_cv_cc_implements___func__="yes" ], +- [ ac_cv_cc_implements___func__="no" ] +- ) ++]], [[ printf("%s", __func__); ]])],[ ac_cv_cc_implements___func__="yes" ],[ ac_cv_cc_implements___func__="no" ++ ]) + ]) + if test "x$ac_cv_cc_implements___func__" = "xyes" ; then + AC_DEFINE(HAVE___func__) +@@ -1840,25 +1687,18 @@ + + AC_CACHE_CHECK([whether getopt has optreset support], + ac_cv_have_getopt_optreset, [ +- AC_TRY_LINK( +- [ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +- ], +- [ extern int optreset; optreset = 0; ], +- [ ac_cv_have_getopt_optreset="yes" ], +- [ ac_cv_have_getopt_optreset="no" ] +- ) ++ ]], [[ extern int optreset; optreset = 0; ]])],[ ac_cv_have_getopt_optreset="yes" ],[ ac_cv_have_getopt_optreset="no" ++ ]) + ]) + if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then + AC_DEFINE(HAVE_GETOPT_OPTRESET) + fi + + AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [ +- AC_TRY_LINK([], +- [ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);], +- [ ac_cv_libc_defines_sys_errlist="yes" ], +- [ ac_cv_libc_defines_sys_errlist="no" ] +- ) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);]])],[ ac_cv_libc_defines_sys_errlist="yes" ],[ ac_cv_libc_defines_sys_errlist="no" ++ ]) + ]) + if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then + AC_DEFINE(HAVE_SYS_ERRLIST) +@@ -1866,11 +1706,8 @@ + + + AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [ +- AC_TRY_LINK([], +- [ extern int sys_nerr; printf("%i", sys_nerr);], +- [ ac_cv_libc_defines_sys_nerr="yes" ], +- [ ac_cv_libc_defines_sys_nerr="no" ] +- ) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int sys_nerr; printf("%i", sys_nerr);]])],[ ac_cv_libc_defines_sys_nerr="yes" ],[ ac_cv_libc_defines_sys_nerr="no" ++ ]) + ]) + if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then + AC_DEFINE(HAVE_SYS_NERR) +@@ -1965,16 +1802,13 @@ + AC_DEFINE(KRB5) + KRB5_MSG="yes" + AC_MSG_CHECKING(whether we are using Heimdal) +- AC_TRY_COMPILE([ #include ], +- [ char *tmp = heimdal_version; ], +- [ AC_MSG_RESULT(yes) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ char *tmp = heimdal_version; ]])],[ AC_MSG_RESULT(yes) + AC_DEFINE(HEIMDAL) + K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" +- ], +- [ AC_MSG_RESULT(no) ++ ],[ AC_MSG_RESULT(no) + K5LIBS="-lkrb5 -lk5crypto -lcom_err" +- ] +- ) ++ ++ ]) + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib" + fi +@@ -2083,13 +1917,14 @@ + ) + fi + fi ++if test "$cross_compiling" != yes; then + AC_CHECK_FILE("/dev/ptc", + [ + 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, + [ --with-mantype=man|cat|doc Set man page type], +@@ -2148,14 +1983,12 @@ + + if test -z "$disable_shadow" ; then + AC_MSG_CHECKING([if the systems has expire shadow information]) +- AC_TRY_COMPILE( +- [ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + struct spwd sp; +- ],[ sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; ], +- [ sp_expire_available=yes ], [] +- ) ++ ]], [[ sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; ]])],[ sp_expire_available=yes ],[ ++ ]) + + if test "x$sp_expire_available" = "xyes" ; then + AC_MSG_RESULT(yes) +@@ -2183,7 +2016,9 @@ + fi + + # check for /etc/default/login and use it if present. ++if test "x$cross_compiling" != "xyes"; then + AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ]) ++fi + + if test "x$external_path_file" = "x/etc/default/login"; then + AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) +@@ -2222,8 +2057,7 @@ + If PATH is defined in $external_path_file, ensure the path to scp is included, + otherwise scp will not work.]) + fi +- AC_TRY_RUN( +- [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + /* find out what STDPATH is */ + #include + #ifdef HAVE_PATHS_H +@@ -2255,10 +2089,8 @@ + + exit(0); + } +- ], [ user_path=`cat conftest.stdpath` ], +- [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ], +- [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ] +- ) ++ ]])],[ user_path=`cat conftest.stdpath` ],[ 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 + t_bindir=`eval echo ${bindir}` + case $t_bindir in +@@ -2438,7 +2270,7 @@ + dnl lastlog detection + dnl NOTE: the code itself will detect if lastlog is a directory + AC_MSG_CHECKING([if your system defines LASTLOG_FILE]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #ifdef HAVE_LASTLOG_H +@@ -2450,10 +2282,7 @@ + #ifdef HAVE_LOGIN_H + # include + #endif +- ], +- [ char *lastlog = LASTLOG_FILE; ], +- [ AC_MSG_RESULT(yes) ], +- [ ++ ]], [[ char *lastlog = LASTLOG_FILE; ]])],[ AC_MSG_RESULT(yes) ],[ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([if your system defines _PATH_LASTLOG]) + AC_TRY_COMPILE([ +@@ -2472,8 +2301,8 @@ + AC_MSG_RESULT(no) + system_lastlog_path=no + ]) +- ] +-) ++ ++]) + + if test -z "$conf_lastlog_location"; then + if test x"$system_lastlog_path" = x"no" ; then +@@ -2495,18 +2324,15 @@ + + dnl utmp detection + AC_MSG_CHECKING([if your system defines UTMP_FILE]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #ifdef HAVE_PATHS_H + # include + #endif +- ], +- [ char *utmp = UTMP_FILE; ], +- [ AC_MSG_RESULT(yes) ], +- [ AC_MSG_RESULT(no) +- system_utmp_path=no ] +-) ++ ]], [[ char *utmp = UTMP_FILE; ]])],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) ++ system_utmp_path=no ++]) + if test -z "$conf_utmp_location"; then + if test x"$system_utmp_path" = x"no" ; then + for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do +@@ -2525,18 +2351,15 @@ + + dnl wtmp detection + AC_MSG_CHECKING([if your system defines WTMP_FILE]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #ifdef HAVE_PATHS_H + # include + #endif +- ], +- [ char *wtmp = WTMP_FILE; ], +- [ AC_MSG_RESULT(yes) ], +- [ AC_MSG_RESULT(no) +- system_wtmp_path=no ] +-) ++ ]], [[ char *wtmp = WTMP_FILE; ]])],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) ++ system_wtmp_path=no ++]) + if test -z "$conf_wtmp_location"; then + if test x"$system_wtmp_path" = x"no" ; then + for f in /usr/adm/wtmp /var/log/wtmp; do +@@ -2558,7 +2381,7 @@ + dnl utmpx, but not define UTMPX_FILE (ditto wtmpx.) No doubt it's out + dnl there, though. + AC_MSG_CHECKING([if your system defines UTMPX_FILE]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #ifdef HAVE_UTMPX_H +@@ -2567,12 +2390,9 @@ + #ifdef HAVE_PATHS_H + # include + #endif +- ], +- [ char *utmpx = UTMPX_FILE; ], +- [ AC_MSG_RESULT(yes) ], +- [ AC_MSG_RESULT(no) +- system_utmpx_path=no ] +-) ++ ]], [[ char *utmpx = UTMPX_FILE; ]])],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) ++ system_utmpx_path=no ++]) + if test -z "$conf_utmpx_location"; then + if test x"$system_utmpx_path" = x"no" ; then + AC_DEFINE(DISABLE_UTMPX) +@@ -2583,7 +2403,7 @@ + + dnl wtmpx detection + AC_MSG_CHECKING([if your system defines WTMPX_FILE]) +-AC_TRY_COMPILE([ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #ifdef HAVE_UTMPX_H +@@ -2592,12 +2412,9 @@ + #ifdef HAVE_PATHS_H + # include + #endif +- ], +- [ char *wtmpx = WTMPX_FILE; ], +- [ AC_MSG_RESULT(yes) ], +- [ AC_MSG_RESULT(no) +- system_wtmpx_path=no ] +-) ++ ]], [[ char *wtmpx = WTMPX_FILE; ]])],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) ++ system_wtmpx_path=no ++]) + if test -z "$conf_wtmpx_location"; then + if test x"$system_wtmpx_path" = x"no" ; then + AC_DEFINE(DISABLE_WTMPX) +--- openssh-3.7.1p1/configure~configure ++++ openssh-3.7.1p1/configure +@@ -1,12 +1,81 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52. ++# Generated by GNU Autoconf 2.57. + # +-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 ++# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + # Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then ++ set -o posix ++fi ++ ++# Support unset when possible. ++if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++$as_unset ENV MAIL MAILPATH ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)$' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } ++ /^X\/\(\/\/\)$/{ s//\1/; q; } ++ /^X\/\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ + ++# PATH needs CR, and LINENO needs CR and PATH. + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +@@ -14,22 +83,113 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi + +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix +-fi ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" || { ++ # Find who we are. Look in the path if we contain no path at all ++ # relative or not. ++ case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done + +-# Name of the executable. +-as_me=`echo "$0" |sed 's,.*[\\/],,'` ++ ;; ++ esac ++ # We did not find ourselves, most probably we were run as `sh COMMAND' ++ # in which case we are not to be found in the path. ++ if test "x$as_myself" = x; then ++ as_myself=$0 ++ fi ++ if test ! -f "$as_myself"; then ++ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 ++ { (exit 1); exit 1; }; } ++ fi ++ case $CONFIG_SHELL in ++ '') ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for as_base in sh bash ksh sh5; do ++ case $as_dir in ++ /*) ++ if ("$as_dir/$as_base" -c ' ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then ++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } ++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } ++ CONFIG_SHELL=$as_dir/$as_base ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} ++ fi;; ++ esac ++ done ++done ++;; ++ esac ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line before each line; the second 'sed' does the real ++ # work. The second script uses 'N' to pair each line-number line ++ # with the numbered line, and appends trailing '-' during ++ # substitution so that $LINENO is not a special case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) ++ sed '=' <$as_myself | ++ sed ' ++ N ++ s,$,-, ++ : loop ++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ t loop ++ s,-$,, ++ s,^['$as_cr_digits']*\n,, ++ ' >$as_me.lineno && ++ chmod +x $as_me.lineno || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensible to this). ++ . ./$as_me.lineno ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ++ *c*,-n*) ECHO_N= ECHO_C=' ++' ECHO_T=' ' ;; ++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++esac + + if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +@@ -55,24 +215,20 @@ + fi + rm -f conf$$ conf$$.exe conf$$.file + +-as_executable_p="test -f" +- +-# Support unset when possible. +-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +- as_unset=unset ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: + else +- as_unset=false ++ as_mkdir_p=false + fi + +-# NLS nuisances. +-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } ++as_executable_p="test -f" ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++ + + # IFS + # We need space, tab and new line, in precisely that order. +@@ -81,7 +237,8 @@ + IFS=" $as_nl" + + # CDPATH. +-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } ++$as_unset CDPATH ++ + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -94,9 +251,11 @@ + # Initializations. + # + ac_default_prefix=/usr/local ++ac_config_libobj_dir=. + cross_compiling=no + subdirs= +-MFLAGS= MAKEFLAGS= ++MFLAGS= ++MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} + + # Maximum number of lines to put in a shell here document. +@@ -104,6 +263,13 @@ + # only ac_max_sed_lines should be used. + : ${ac_max_here_lines=38} + ++# Identity of this package. ++PACKAGE_NAME= ++PACKAGE_TARNAME= ++PACKAGE_VERSION= ++PACKAGE_STRING= ++PACKAGE_BUGREPORT= ++ + ac_unique_file="ssh.c" + # Factoring default headers for most tests. + ac_includes_default="\ +@@ -142,6 +308,9 @@ + # include + #endif" + ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PERL SED ENT TEST_MINUS_S_SH SH LOGIN_PROGRAM_FALLBACK LD EGREP LIBWRAP LIBPAM INSTALL_SSH_RAND_HELPER SSH_PRIVSEP_USER PROG_LS PROG_NETSTAT PROG_ARP PROG_IFCONFIG PROG_JSTAT PROG_PS PROG_SAR PROG_W PROG_WHO PROG_LAST PROG_LASTLOG PROG_DF PROG_VMSTAT PROG_UPTIME PROG_IPCS PROG_TAIL INSTALL_SSH_PRNG_CMDS OPENSC_CONFIG PRIVSEP_PATH xauth_path STRIP_OPT XAUTH_PATH NROFF MANTYPE mansubdir user_path piddir LIBOBJS LTLIBOBJS' ++ac_subst_files='' ++ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false +@@ -180,13 +349,6 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + +-# Identity of this package. +-PACKAGE_NAME= +-PACKAGE_TARNAME= +-PACKAGE_VERSION= +-PACKAGE_STRING= +-PACKAGE_BUGREPORT= +- + ac_prev= + for ac_option + do +@@ -319,7 +481,7 @@ + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ++ | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +@@ -498,7 +660,7 @@ + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac + done +@@ -510,18 +672,19 @@ + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; +- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac + done + + # There might be people who depend on the old broken behavior: `$host' + # used to hold the argument of --host etc. ++# FIXME: To remove some day. + build=$build_alias + host=$host_alias + target=$target_alias + +-# FIXME: should be removed in autoconf 3.0. ++# FIXME: To remove some day. + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +@@ -537,13 +700,23 @@ + + test "$silent" = yes && exec 6>/dev/null + ++ + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. +- ac_prog=$0 +- ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` +- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ++ ac_confdir=`(dirname "$0") 2>/dev/null || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$0" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. +@@ -553,13 +726,16 @@ + fi + if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then +- { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } + else +- { echo "$as_me: error: cannot find sources in $srcdir" >&2 ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi + fi ++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || ++ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 ++ { (exit 1); exit 1; }; } + srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` + ac_env_build_alias_set=${build_alias+set} + ac_env_build_alias_value=$build_alias +@@ -600,7 +776,7 @@ + if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. +- cat <&2 ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi + cd $ac_popdir + done +@@ -769,31 +965,31 @@ + + test -n "$ac_init_help" && exit 0 + if $ac_init_version; then +- cat <<\EOF ++ cat <<\_ACEOF + +-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 ++Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. +-EOF ++_ACEOF + exit 0 + fi + exec 5>config.log +-cat >&5 <&5 <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52. Invocation command line was ++generated by GNU Autoconf 2.57. Invocation command line was + + $ $0 $@ + +-EOF ++_ACEOF + { + cat <<_ASUNAME +-## ---------- ## +-## Platform. ## +-## ---------- ## ++## --------- ## ++## Platform. ## ++## --------- ## + + hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` + uname -m = `(uname -m) 2>/dev/null || echo unknown` +@@ -812,51 +1008,96 @@ + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` + /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +-PATH = $PATH +- + _ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ echo "PATH: $as_dir" ++done ++ + } >&5 + +-cat >&5 <&5 <<_ACEOF ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++_ACEOF + +-EOF + + # Keep a trace of the command line. + # Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. + # Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. + ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= + ac_sep= +-for ac_arg ++ac_must_keep_next=false ++for ac_pass in 1 2 + do +- case $ac_arg in +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ;; +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +- ac_sep=" " ;; +- *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" +- ac_sep=" " ;; +- esac +- # Get rid of the leading space. ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 2) ++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ++ # Get rid of the leading space. ++ ac_sep=" " ++ ;; ++ esac ++ done + done ++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } ++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there + # would cause problems or look ugly. ++# WARNING: Be sure not to use single quotes in there, as some shells, ++# such as our DU 5.0 friend, will then `close' the trap. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. +- echo >&5 +- echo "## ----------------- ##" >&5 +- echo "## Cache variables. ##" >&5 +- echo "## ----------------- ##" >&5 +- echo >&5 +- # The following way of writing the cache mishandles newlines in values, ++ { ++ echo ++ ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, + { + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +@@ -870,21 +1111,53 @@ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +-} >&5 +- sed "/^$/d" confdefs.h >conftest.log +- if test -s conftest.log; then +- echo >&5 +- echo "## ------------ ##" >&5 +- echo "## confdefs.h. ##" >&5 +- echo "## ------------ ##" >&5 +- echo >&5 +- cat conftest.log >&5 +- fi +- (echo; echo) >&5 +- test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" >&5 +- echo "$as_me: exit $exit_status" >&5 +- rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && ++} ++ echo ++ ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=$`echo $ac_var` ++ echo "$ac_var='"'"'$ac_val'"'"'" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------- ## ++## Output files. ## ++## ------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=$`echo $ac_var` ++ echo "$ac_var='"'"'$ac_val'"'"'" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ sed "/^$/d" confdefs.h | sort ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core core.* *.core && ++ rm -rf conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status + ' 0 + for ac_signal in 1 2 13 15; do +@@ -897,6 +1170,33 @@ + # AIX cpp loses on an empty file, so make sure it contains at least a newline. + echo >confdefs.h + ++# Predefined preprocessor variables. ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$