--- ircd-hybrid-7.2/configure 2009/10/18 14:26:49 1013 +++ ircd-hybrid-7.2/configure 2009/10/25 00:08:06 1015 @@ -2495,8 +2495,6 @@ as_fn_append ac_header_list " sys/resour as_fn_append ac_header_list " sys/param.h" as_fn_append ac_header_list " errno.h" as_fn_append ac_header_list " sys/syslog.h" -as_fn_append ac_header_list " stddef.h" -as_fn_append ac_header_list " libgen.h" as_fn_append ac_header_list " types.h" as_fn_append ac_header_list " socket.h" as_fn_append ac_header_list " sys/wait.h" @@ -4441,7 +4439,7 @@ if test "$LEX" = :; then fi -#ltdl stuff +# Initializing libtool. case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -5122,13 +5120,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5125: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5123: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5128: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5126: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5131: output\"" >&5) + (eval echo "\"\$as_me:5129: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6333,7 +6331,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6336 "configure"' > conftest.$ac_ext + echo '#line 6334 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7857,11 +7855,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7860: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7858: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7864: \$? = $ac_status" >&5 + echo "$as_me:7862: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8196,11 +8194,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8199: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8197: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8203: \$? = $ac_status" >&5 + echo "$as_me:8201: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8301,11 +8299,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8304: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8302: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8308: \$? = $ac_status" >&5 + echo "$as_me:8306: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8356,11 +8354,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8359: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8357: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8363: \$? = $ac_status" >&5 + echo "$as_me:8361: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10093,7 +10091,7 @@ rm -f core conftest.err conftest.$ac_obj libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 10096 "configure"' > conftest.$ac_ext + echo '#line 10094 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10746,7 +10744,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10749 "configure" +#line 10747 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10842,7 +10840,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10845 "configure" +#line 10843 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11514,7 +11512,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11517 "configure" +#line 11515 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12127,7 +12125,6 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\ # Only expand once: -LIBTOOL="$LIBTOOL --silent" # Checks for libraries. @@ -12572,10 +12569,7 @@ done - - - - +# check for /dev/null so we can use it to hold evil fd's { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/null" >&5 $as_echo_n "checking for /dev/null... " >&6; } if test -c /dev/null; then : @@ -12868,6 +12862,113 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 $as_echo "disabled" >&6; } fi + +if test "$cf_enable_openssl" != "no"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.7 or above" >&5 +$as_echo_n "checking for OpenSSL 0.9.7 or above... " >&6; } + if test "$cross_compiling" = yes; then : + cf_openssl_version_ok=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include +int +main () +{ +exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + cf_openssl_version_ok=yes +else + cf_openssl_version_ok=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + + if test "$cf_openssl_version_ok" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5 +$as_echo_n "checking for RSA_free in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_RSA_free+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $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 RSA_free (); +int +main () +{ +return RSA_free (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_RSA_free=yes +else + ac_cv_lib_crypto_RSA_free=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_crypto_RSA_free" >&5 +$as_echo "$ac_cv_lib_crypto_RSA_free" >&6; } +if test "x$ac_cv_lib_crypto_RSA_free" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBCRYPTO 1 +_ACEOF + + LIBS="-lcrypto $LIBS" + +fi + + if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then : + for ac_func in EVP_bf_cfb \ + EVP_cast5_cfb \ + EVP_idea_cfb \ + EVP_rc5_32_12_16_cfb \ + EVP_des_ede3_cfb \ + EVP_des_cfb +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - OpenSSL support disabled" >&5 +$as_echo "no - OpenSSL support disabled" >&6; } + cf_enable_openssl="no" +fi +fi + if test "$cf_enable_openssl" = yes; then ENABLE_SSL_TRUE= ENABLE_SSL_FALSE='#' @@ -12901,7 +13002,8 @@ else fi -if test "$small_net" = yes; then +if test "$small_net" = "yes"; then : + $as_echo "#define NICKNAMEHISTORYLENGTH 1500" >>confdefs.h @@ -12934,6 +13036,8 @@ $as_echo "#define DNS_HEAP_SIZE 128" >>c else + + $as_echo "#define NICKNAMEHISTORYLENGTH 15000" >>confdefs.h @@ -13376,7 +13480,7 @@ fi cat >>confdefs.h <<_ACEOF -#define TOPICLEN ($topiclen+1) +#define TOPICLEN ($topiclen) _ACEOF