diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 132 |
1 files changed, 105 insertions, 27 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Rev:27 by chappa@washington.edu. +# From configure.ac Rev:28 by chappa@washington.edu. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for alpine 2.21.99999. # @@ -830,7 +830,6 @@ with_libiconv_prefix with_libintl_prefix enable_dmalloc with_dmalloc_dir -with_bundled_tools with_date_stamp with_host_stamp with_ps_cmd @@ -934,6 +933,7 @@ with_supplied_regex with_pthread with_system_mail_directory with_c_client_target +with_bundled_tools with_ipv6 with_ntlm ' @@ -1607,8 +1607,6 @@ Optional Packages: --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir --with-dmalloc-dir=DIR Root of dmalloc lib/include path - --with-bundled-tools Build additional tools (mtest, imapd, etc.) Default: - --with-bundled-tools=no --with-date-stamp=DATE Set this as the date this program was built. Default: output of `date` --with-host-stamp=HOST Set name of computer for compilation. Default: @@ -1784,6 +1782,8 @@ Optional Packages: Directory where local mail is delivered --with-c-client-target=TARGET IMAP build target (see imap/Makefile) + --with-bundled-tools Build additional tools (mtest, imapd, etc.) Default: + --with-bundled-tools=no --without-ipv6 Disable IPv6, primarily to work around resolver problems --without-ntlm Disable NTLM client support @@ -15218,18 +15218,6 @@ $as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h fi -alpine_c_client_bundled="no" - -# Check whether --with-bundled-tools was given. -if test "${with_bundled_tools+set}" = set; then : - withval=$with_bundled_tools; - if test "x$withval" = "xyes" ; then - alpine_c_client_bundled="" - fi - -fi - - ALPINE_datestamp=`date` # Check whether --with-date-stamp was given. @@ -17879,6 +17867,18 @@ fi +alpine_c_client_bundled="no" + +# Check whether --with-bundled-tools was given. +if test "${with_bundled_tools+set}" = set; then : + withval=$with_bundled_tools; + if test "x$withval" = "xyes" ; then + alpine_c_client_bundled="" + fi + +fi + + alpine_PAM="none" case "$host" in @@ -17920,9 +17920,10 @@ case "$host" in alpine_PAM="yes" else systype="LNX" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 -$as_echo_n "checking for pam_start in -lpam... " >&6; } -if ${ac_cv_lib_pam_pam_start+:} false; then : + if test -z "$alpine_c_client_bundled" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for am_start in -lpam" >&5 +$as_echo_n "checking for am_start in -lpam... " >&6; } +if ${ac_cv_lib_pam_am_start+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17936,27 +17937,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char pam_start (); +char am_start (); int main () { -return pam_start (); +return am_start (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pam_pam_start=yes + ac_cv_lib_pam_am_start=yes else - ac_cv_lib_pam_pam_start=no + ac_cv_lib_pam_am_start=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 -$as_echo "$ac_cv_lib_pam_pam_start" >&6; } -if test "x$ac_cv_lib_pam_pam_start" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_am_start" >&5 +$as_echo "$ac_cv_lib_pam_am_start" >&6; } +if test "x$ac_cv_lib_pam_am_start" = xyes; then : alpine_c_client_target="lnp" alpine_PAM="yes" @@ -17971,6 +17972,13 @@ else fi + else + if test -f /etc/shadow ; then + alpine_c_client_target="slx" + else + alpine_c_client_target="lnx" + fi + fi fi ;; *-apple-darwin*) @@ -17991,7 +17999,8 @@ $as_echo "#define APPLEKEYCHAIN 1" >>confdefs.h ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 + if test -z "$alpine_c_client_bundled" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 $as_echo_n "checking for pam_start in -lpam... " >&6; } if ${ac_cv_lib_pam_pam_start+:} false; then : $as_echo_n "(cached) " >&6 @@ -18061,6 +18070,9 @@ else fi + else + alpine_c_client_target="osx" + fi ;; *-*-solaris*) if test x$GCC = "xyes" ; then @@ -19229,6 +19241,72 @@ fi fi fi fi + +if test -n "$alpine_c_client_bundled" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 +$as_echo_n "checking for library containing crypt... " >&6; } +if ${ac_cv_search_crypt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char crypt (); +int +main () +{ +return crypt (); + ; + return 0; +} +_ACEOF +for ac_lib in '' crypt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_crypt=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_crypt+:} false; then : + break +fi +done +if ${ac_cv_search_crypt+:} false; then : + +else + ac_cv_search_crypt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 +$as_echo "$ac_cv_search_crypt" >&6; } +ac_res=$ac_cv_search_crypt +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + LIBS="$LIBS -lcrypt" + +else + + as_fn_error $? "crypt library not found." "$LINENO" 5 + +fi + +fi + C_CLIENT_BUNDLED=$alpine_c_client_bundled |