From 64605b326c113353e794b2dd8fbeac25c536b67e Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Thu, 31 May 2012 12:43:57 +0000 Subject: [PATCH] Respin configure for configure.in r201. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@202 13b04d17-f746-0410-82c6-800466cd88b0 --- configure | 335 ++++++++++++++++++++++-------------------------------- 1 file changed, 139 insertions(+), 196 deletions(-) diff --git a/configure b/configure index e45437d..b95217b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 198 . +# From configure.in Revision: 201 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -883,7 +883,7 @@ Optional Packages: Prefix where AUDIOFILE is installed (optional) --with-audiofile-exec-prefix=PFX Exec prefix where AUDIOFILE is installed (optional) - --with-ssl=PFX Enable SSL support (Prefix is optional) + --with-ssl[=PATH] Enable SSL support (enabled by default if OpenSSL found) --with-tgetent Use tgetent (termcap) instead of setupterm (ncurses) --with-tcl Enable Tcl support --with-maildir=PATH Enable QMAIL support @@ -891,7 +891,7 @@ Optional Packages: Connect to SERVERNAME by default Additional servers can be separated by a comma --with-socks=4|5 Enable external SOCKS4/SOCKS5 support - --with-plugins=LIST Enable plugin support + --with-plugins[=LIST] Enable plugin support LIST is a comma separated list of plugins to build If none are specified, all available plugins are built --with-xmms-prefix=PFX Prefix where XMMS is installed (optional) @@ -6334,84 +6334,21 @@ _ACEOF if test x"$bx_cv_lib_resolver" != x"none required"; then LIBS="$bx_cv_lib_resolver $LIBS" fi - echo "$as_me:$LINENO: checking for iphlpapi.h" >&5 -echo $ECHO_N "checking for iphlpapi.h... $ECHO_C" >&6 -if test "${ac_cv_header_iphlpapi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include + echo "$as_me:$LINENO: checking for the iphlpapi library" >&5 +echo $ECHO_N "checking for the iphlpapi library... $ECHO_C" >&6 + OLDLIBS="$LIBS" + LIBS="-liphlpapi $LIBS" + cat >conftest.$ac_ext <<_ACEOF -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_iphlpapi_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + #include + #include -ac_cv_header_iphlpapi_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_iphlpapi_h" >&5 -echo "${ECHO_T}$ac_cv_header_iphlpapi_h" >&6 -if test $ac_cv_header_iphlpapi_h = yes; then - -echo "$as_me:$LINENO: checking for GetNetworkParams in -liphlpapi" >&5 -echo $ECHO_N "checking for GetNetworkParams in -liphlpapi... $ECHO_C" >&6 -if test "${ac_cv_lib_iphlpapi_GetNetworkParams+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liphlpapi $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char GetNetworkParams (); -int -main () -{ -GetNetworkParams (); - ; - return 0; -} + int main() + { + ULONG buflen; + GetNetworkParams(0, &buflen); + return buflen; + } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6435,31 +6372,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_iphlpapi_GetNetworkParams=yes + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBIPHLPAPI 1 +_ACEOF + + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_iphlpapi_GetNetworkParams=no + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$OLDLIBS" + fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_iphlpapi_GetNetworkParams" >&5 -echo "${ECHO_T}$ac_cv_lib_iphlpapi_GetNetworkParams" >&6 -if test $ac_cv_lib_iphlpapi_GetNetworkParams = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBIPHLPAPI 1 -_ACEOF - - LIBS="-liphlpapi $LIBS" - -fi - -fi - - else { echo "$as_me:$LINENO: WARNING: No resolver library found, /nslookup will be disabled." >&5 echo "$as_me: WARNING: No resolver library found, /nslookup will be disabled." >&2;} @@ -10595,94 +10528,19 @@ echo $ECHO_N "checking whether to enable SSL support... $ECHO_C" >&6 # Check whether --with-ssl or --without-ssl was given. if test "${with_ssl+set}" = set; then withval="$with_ssl" - case "$withval" in + +else + with_ssl=check +fi; + +case "$with_ssl" in yes) echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SSL 1 -_ACEOF - - LIBS="$LIBS -lssl -lcrypto" - -echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5 -echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6 -if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char SSL_accept (); -int -main () -{ -SSL_accept (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ssl_SSL_accept=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ssl_SSL_accept=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_accept" >&6 -if test $ac_cv_lib_ssl_SSL_accept = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF - - LIBS="-lssl $LIBS" - -else - { { echo "$as_me:$LINENO: error: Could not find OpenSSL." >&5 -echo "$as_me: error: Could not find OpenSSL." >&2;} - { (exit 1); exit 1; }; } -fi - + ;; + check) + echo "$as_me:$LINENO: result: if available" >&5 +echo "${ECHO_T}if available" >&6 ;; no) echo "$as_me:$LINENO: result: no" >&5 @@ -10691,13 +10549,88 @@ echo "${ECHO_T}no" >&6 *) echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 + CFLAGS="$CFLAGS -I${with_ssl}/include" + LDFLAGS="$LDFLAGS -L${with_ssl}/lib" + with_ssl=yes + ;; +esac +case "$with_ssl" in + yes|check) -cat >>confdefs.h <<\_ACEOF -#define HAVE_SSL 1 +echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5 +echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6 +if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char SSLeay (); +int +main () +{ +SSLeay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_crypto_SSLeay=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_crypto_SSLeay=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5 +echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6 +if test $ac_cv_lib_crypto_SSLeay = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYPTO 1 _ACEOF - LIBS="$LIBS -L${withval}/lib -lssl -lcrypto" - CFLAGS="$CFLAGS -I${withval}/include" + LIBS="-lcrypto $LIBS" + +fi + + if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5 echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6 @@ -10770,19 +10703,29 @@ _ACEOF LIBS="-lssl $LIBS" -else - { { echo "$as_me:$LINENO: error: Could not find OpenSSL." >&5 -echo "$as_me: error: Could not find OpenSSL." >&2;} - { (exit 1); exit 1; }; } fi - ;; - esac -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + fi + if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then -fi; +cat >>confdefs.h <<\_ACEOF +#define HAVE_SSL 1 +_ACEOF + + else + if test x"$with_ssl" = x"yes"; then + { { echo "$as_me:$LINENO: error: --with-ssl given, but could not find OpenSSL. +See \`config.log' for more details." >&5 +echo "$as_me: error: --with-ssl given, but could not find OpenSSL. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: OpenSSL not found, will not have SSL support." >&5 +echo "$as_me: WARNING: OpenSSL not found, will not have SSL support." >&2;} + fi + fi + ;; +esac if test -n "$gtk" -o -n "$pm" -o -n "$win32"; then