ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.0.x/configure
(Generate patch)

Comparing:
ircd-hybrid-8/configure (file contents), Revision 1425 by michael, Wed Jun 6 08:44:22 2012 UTC vs.
ircd-hybrid/branches/8.0.x/configure (file contents), Revision 1822 by michael, Sun Apr 14 12:36:55 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 1402 2012-05-09 18:42:45Z michael .
2 > # From configure.ac Id: configure.ac 1800 2013-03-31 19:19:25Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4 < # Generated by GNU Autoconf 2.69 for ircd-hybrid 8beta1.
4 > # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.0.7.
5   #
6   # Report bugs to <bugs@ircd-hybrid.org>.
7   #
# Line 593 | Line 593 | MAKEFLAGS=
593   # Identity of this package.
594   PACKAGE_NAME='ircd-hybrid'
595   PACKAGE_TARNAME='ircd-hybrid'
596 < PACKAGE_VERSION='8beta1'
597 < PACKAGE_STRING='ircd-hybrid 8beta1'
596 > PACKAGE_VERSION='8.0.7'
597 > PACKAGE_STRING='ircd-hybrid 8.0.7'
598   PACKAGE_BUGREPORT='bugs@ircd-hybrid.org'
599   PACKAGE_URL=''
600  
# Line 723 | Line 723 | CC
723   MAINT
724   MAINTAINER_MODE_FALSE
725   MAINTAINER_MODE_TRUE
726 + AM_BACKSLASH
727 + AM_DEFAULT_VERBOSITY
728 + AM_DEFAULT_V
729 + AM_V
730   am__untar
731   am__tar
732   AMTAR
733   am__leading_dot
734   SET_MAKE
735   AWK
736 + mkdir_p
737   MKDIR_P
738   INSTALL_STRIP_PROGRAM
739   STRIP
# Line 786 | Line 791 | SHELL'
791   ac_subst_files=''
792   ac_user_opts='
793   enable_option_checking
794 + enable_silent_rules
795   enable_maintainer_mode
796   enable_dependency_tracking
797   enable_static
# Line 800 | Line 806 | with_ltdl_include
806   with_ltdl_lib
807   enable_ltdl_install
808   enable_libpcre
809 + enable_libGeoIP
810   enable_openssl
811   enable_assert
805 enable_small_net
812   enable_kqueue
813   enable_epoll
814   enable_devpoll
809 enable_rtsigio
815   enable_poll
816   enable_select
812 with_nicklen
813 with_topiclen
817   enable_halfops
818   enable_debugging
819   enable_warnings
# Line 1366 | Line 1369 | if test "$ac_init_help" = "long"; then
1369    # Omit some internal or obsolete options to make the list less imposing.
1370    # This message is too long to be a string in the A/UX 3.1 sh.
1371    cat <<_ACEOF
1372 < \`configure' configures ircd-hybrid 8beta1 to adapt to many kinds of systems.
1372 > \`configure' configures ircd-hybrid 8.0.7 to adapt to many kinds of systems.
1373  
1374   Usage: $0 [OPTION]... [VAR=VALUE]...
1375  
# Line 1436 | Line 1439 | fi
1439  
1440   if test -n "$ac_init_help"; then
1441    case $ac_init_help in
1442 <     short | recursive ) echo "Configuration of ircd-hybrid 8beta1:";;
1442 >     short | recursive ) echo "Configuration of ircd-hybrid 8.0.7:";;
1443     esac
1444    cat <<\_ACEOF
1445  
# Line 1444 | Line 1447 | Optional Features:
1447    --disable-option-checking  ignore unrecognized --enable/--with options
1448    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1449    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1450 +  --enable-silent-rules   less verbose build output (undo: "make V=1")
1451 +  --disable-silent-rules  verbose build output (undo: "make V=0")
1452    --enable-maintainer-mode
1453                            enable make rules and dependencies not useful (and
1454                            sometimes confusing) to the casual installer
# Line 1458 | Line 1463 | Optional Features:
1463    --disable-libtool-lock  avoid locking (might break parallel builds)
1464    --enable-ltdl-install   install libltdl
1465    --disable-libpcre       Disable PCRE support
1466 +  --disable-libgeoip      Disable GeoIP support
1467    --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
1468    --disable-openssl            Disable OpenSSL support.
1469    --enable-assert         Enable assert() statements
1464  --enable-small-net      Enable small network support.
1470    --enable-kqueue         Force kqueue usage.
1471    --enable-epoll          Force epoll usage.
1472    --enable-devpoll        Force devpoll usage.
1468  --enable-rtsigio        Force rtsigio usage.
1473    --enable-poll           Force poll usage.
1474    --enable-select         Force select usage.
1475    --enable-halfops        Enable halfops support.
# Line 1483 | Line 1487 | Optional Packages:
1487    --with-included-ltdl    use the GNU ltdl sources included here
1488    --with-ltdl-include=DIR use the ltdl headers installed in DIR
1489    --with-ltdl-lib=DIR     use the libltdl.la installed in DIR
1486  --with-nicklen=<value>  Set nickname length (default 9).
1487  --with-topiclen=<value> Set topic length (default 160).
1490  
1491   Some influential environment variables:
1492    CC          C compiler command
# Line 1568 | Line 1570 | fi
1570   test -n "$ac_init_help" && exit $ac_status
1571   if $ac_init_version; then
1572    cat <<\_ACEOF
1573 < ircd-hybrid configure 8beta1
1573 > ircd-hybrid configure 8.0.7
1574   generated by GNU Autoconf 2.69
1575  
1576   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 2094 | Line 2096 | cat >config.log <<_ACEOF
2096   This file contains any messages produced by compilers while
2097   running configure, to aid debugging if configure makes a mistake.
2098  
2099 < It was created by ircd-hybrid $as_me 8beta1, which was
2099 > It was created by ircd-hybrid $as_me 8.0.7, which was
2100   generated by GNU Autoconf 2.69.  Invocation command line was
2101  
2102    $ $0 $@
# Line 2454 | Line 2456 | ac_link='$CC -o conftest$ac_exeext $CFLA
2456   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2457  
2458  
2459 < am__api_version='1.12'
2459 > am__api_version='1.13'
2460  
2461   ac_aux_dir=
2462   for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
# Line 2667 | Line 2669 | if test x"${MISSING+set}" != xset; then
2669    esac
2670   fi
2671   # Use eval to expand $SHELL
2672 < if eval "$MISSING --run true"; then
2673 <  am_missing_run="$MISSING --run "
2672 > if eval "$MISSING --is-lightweight"; then
2673 >  am_missing_run="$MISSING "
2674   else
2675    am_missing_run=
2676    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
# Line 2908 | Line 2910 | else
2910   fi
2911   rmdir .tst 2>/dev/null
2912  
2913 + # Check whether --enable-silent-rules was given.
2914 + if test "${enable_silent_rules+set}" = set; then :
2915 +  enableval=$enable_silent_rules;
2916 + fi
2917 +
2918 + case $enable_silent_rules in # (((
2919 +  yes) AM_DEFAULT_VERBOSITY=0;;
2920 +   no) AM_DEFAULT_VERBOSITY=1;;
2921 +    *) AM_DEFAULT_VERBOSITY=1;;
2922 + esac
2923 + am_make=${MAKE-make}
2924 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2925 + $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2926 + if ${am_cv_make_support_nested_variables+:} false; then :
2927 +  $as_echo_n "(cached) " >&6
2928 + else
2929 +  if $as_echo 'TRUE=$(BAR$(V))
2930 + BAR0=false
2931 + BAR1=true
2932 + V=1
2933 + am__doit:
2934 +        @$(TRUE)
2935 + .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2936 +  am_cv_make_support_nested_variables=yes
2937 + else
2938 +  am_cv_make_support_nested_variables=no
2939 + fi
2940 + fi
2941 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2942 + $as_echo "$am_cv_make_support_nested_variables" >&6; }
2943 + if test $am_cv_make_support_nested_variables = yes; then
2944 +    AM_V='$(V)'
2945 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2946 + else
2947 +  AM_V=$AM_DEFAULT_VERBOSITY
2948 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2949 + fi
2950 + AM_BACKSLASH='\'
2951 +
2952   if test "`cd $srcdir && pwd`" != "`pwd`"; then
2953    # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2954    # is not polluted with repeated "-I."
# Line 2930 | Line 2971 | fi
2971  
2972   # Define the identity of the package.
2973   PACKAGE='ircd-hybrid'
2974 < VERSION='8beta1'
2974 > VERSION='8.0.7'
2975  
2976  
2977   cat >>confdefs.h <<_ACEOF
# Line 2958 | Line 2999 | AUTOHEADER=${AUTOHEADER-"${am_missing_ru
2999  
3000   MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3001  
3002 + # For better backward compatibility.  To be removed once Automake 1.9.x
3003 + # dies out for good.  For more background, see:
3004 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3005 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3006 + mkdir_p='$(MKDIR_P)'
3007 +
3008   # We need awk for the "check" target.  The system "awk" is bad on
3009   # some platforms.
3010   # Always define AMTAR for backward compatibility.  Yes, it's still used
# Line 13023 | Line 13070 | LIBTOOL="$LIBTOOL --silent"
13070  
13071   # Checks for libraries.
13072  
13073 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13074 < $as_echo_n "checking for library containing socket... " >&6; }
13075 < if ${ac_cv_search_socket+:} false; then :
13073 >  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13074 > if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13075 >
13076 > else
13077 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
13078 > $as_echo_n "checking for library containing getaddrinfo... " >&6; }
13079 > if ${ac_cv_search_getaddrinfo+:} false; then :
13080    $as_echo_n "(cached) " >&6
13081   else
13082    ac_func_search_save_LIBS=$LIBS
# Line 13038 | Line 13089 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13089   #ifdef __cplusplus
13090   extern "C"
13091   #endif
13092 < char socket ();
13092 > char getaddrinfo ();
13093   int
13094   main ()
13095   {
13096 < return socket ();
13096 > return getaddrinfo ();
13097    ;
13098    return 0;
13099   }
13100   _ACEOF
13101 < for ac_lib in '' socket; do
13101 > for ac_lib in '' nsl; do
13102    if test -z "$ac_lib"; then
13103      ac_res="none required"
13104    else
# Line 13055 | Line 13106 | for ac_lib in '' socket; do
13106      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13107    fi
13108    if ac_fn_c_try_link "$LINENO"; then :
13109 <  ac_cv_search_socket=$ac_res
13109 >  ac_cv_search_getaddrinfo=$ac_res
13110   fi
13111   rm -f core conftest.err conftest.$ac_objext \
13112      conftest$ac_exeext
13113 <  if ${ac_cv_search_socket+:} false; then :
13113 >  if ${ac_cv_search_getaddrinfo+:} false; then :
13114    break
13115   fi
13116   done
13117 < if ${ac_cv_search_socket+:} false; then :
13117 > if ${ac_cv_search_getaddrinfo+:} false; then :
13118  
13119   else
13120 <  ac_cv_search_socket=no
13120 >  ac_cv_search_getaddrinfo=no
13121   fi
13122   rm conftest.$ac_ext
13123   LIBS=$ac_func_search_save_LIBS
13124   fi
13125 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13126 < $as_echo "$ac_cv_search_socket" >&6; }
13127 < ac_res=$ac_cv_search_socket
13125 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
13126 > $as_echo "$ac_cv_search_getaddrinfo" >&6; }
13127 > ac_res=$ac_cv_search_getaddrinfo
13128   if test "$ac_res" != no; then :
13129    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13130  
13080 else
13081  as_fn_error $? "socket library not found" "$LINENO" 5
13131   fi
13132  
13133 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
13134 < $as_echo_n "checking for library containing inet_ntoa... " >&6; }
13135 < if ${ac_cv_search_inet_ntoa+:} false; then :
13133 > fi
13134 >
13135 >  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
13136 > if test "x$ac_cv_func_getnameinfo" = xyes; then :
13137 >
13138 > else
13139 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
13140 > $as_echo_n "checking for library containing getnameinfo... " >&6; }
13141 > if ${ac_cv_search_getnameinfo+:} false; then :
13142    $as_echo_n "(cached) " >&6
13143   else
13144    ac_func_search_save_LIBS=$LIBS
# Line 13096 | Line 13151 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13151   #ifdef __cplusplus
13152   extern "C"
13153   #endif
13154 < char inet_ntoa ();
13154 > char getnameinfo ();
13155   int
13156   main ()
13157   {
13158 < return inet_ntoa ();
13158 > return getnameinfo ();
13159    ;
13160    return 0;
13161   }
# Line 13113 | Line 13168 | for ac_lib in '' nsl; do
13168      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13169    fi
13170    if ac_fn_c_try_link "$LINENO"; then :
13171 <  ac_cv_search_inet_ntoa=$ac_res
13171 >  ac_cv_search_getnameinfo=$ac_res
13172   fi
13173   rm -f core conftest.err conftest.$ac_objext \
13174      conftest$ac_exeext
13175 <  if ${ac_cv_search_inet_ntoa+:} false; then :
13175 >  if ${ac_cv_search_getnameinfo+:} false; then :
13176    break
13177   fi
13178   done
13179 < if ${ac_cv_search_inet_ntoa+:} false; then :
13179 > if ${ac_cv_search_getnameinfo+:} false; then :
13180  
13181   else
13182 <  ac_cv_search_inet_ntoa=no
13182 >  ac_cv_search_getnameinfo=no
13183   fi
13184   rm conftest.$ac_ext
13185   LIBS=$ac_func_search_save_LIBS
13186   fi
13187 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5
13188 < $as_echo "$ac_cv_search_inet_ntoa" >&6; }
13189 < ac_res=$ac_cv_search_inet_ntoa
13187 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5
13188 > $as_echo "$ac_cv_search_getnameinfo" >&6; }
13189 > ac_res=$ac_cv_search_getnameinfo
13190   if test "$ac_res" != no; then :
13191    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13192  
13193   fi
13194  
13195 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
13196 < $as_echo_n "checking for library containing inet_aton... " >&6; }
13197 < if ${ac_cv_search_inet_aton+:} false; then :
13195 > fi
13196 >
13197 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13198 > $as_echo_n "checking for library containing socket... " >&6; }
13199 > if ${ac_cv_search_socket+:} false; then :
13200    $as_echo_n "(cached) " >&6
13201   else
13202    ac_func_search_save_LIBS=$LIBS
# Line 13152 | Line 13209 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13209   #ifdef __cplusplus
13210   extern "C"
13211   #endif
13212 < char inet_aton ();
13212 > char socket ();
13213   int
13214   main ()
13215   {
13216 < return inet_aton ();
13216 > return socket ();
13217    ;
13218    return 0;
13219   }
13220   _ACEOF
13221 < for ac_lib in '' resolv; do
13221 > for ac_lib in '' socket; do
13222    if test -z "$ac_lib"; then
13223      ac_res="none required"
13224    else
# Line 13169 | Line 13226 | for ac_lib in '' resolv; do
13226      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13227    fi
13228    if ac_fn_c_try_link "$LINENO"; then :
13229 <  ac_cv_search_inet_aton=$ac_res
13229 >  ac_cv_search_socket=$ac_res
13230   fi
13231   rm -f core conftest.err conftest.$ac_objext \
13232      conftest$ac_exeext
13233 <  if ${ac_cv_search_inet_aton+:} false; then :
13233 >  if ${ac_cv_search_socket+:} false; then :
13234    break
13235   fi
13236   done
13237 < if ${ac_cv_search_inet_aton+:} false; then :
13237 > if ${ac_cv_search_socket+:} false; then :
13238  
13239   else
13240 <  ac_cv_search_inet_aton=no
13240 >  ac_cv_search_socket=no
13241   fi
13242   rm conftest.$ac_ext
13243   LIBS=$ac_func_search_save_LIBS
13244   fi
13245 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
13246 < $as_echo "$ac_cv_search_inet_aton" >&6; }
13247 < ac_res=$ac_cv_search_inet_aton
13245 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13246 > $as_echo "$ac_cv_search_socket" >&6; }
13247 > ac_res=$ac_cv_search_socket
13248   if test "$ac_res" != no; then :
13249    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13250  
13251 + else
13252 +  as_fn_error $? "socket library not found" "$LINENO" 5
13253   fi
13254  
13196  for ac_func in inet_aton inet_ntop inet_pton
13197 do :
13198  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13199 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13200 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
13201  cat >>confdefs.h <<_ACEOF
13202 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13203 _ACEOF
13204
13205 fi
13206 done
13207
13255    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13256     #include <sys/socket.h>
13257     #include <netdb.h>
# Line 13684 | Line 13731 | fi
13731   fi
13732  
13733  
13734 + # Check whether --enable-libGeoIP was given.
13735 + if test "${enable_libGeoIP+set}" = set; then :
13736 +  enableval=$enable_libGeoIP;
13737 + else
13738 +  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13739 + if test "x$ac_cv_header_GeoIP_h" = xyes; then :
13740 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_lib_version" >&5
13741 + $as_echo_n "checking for library containing GeoIP_lib_version... " >&6; }
13742 + if ${ac_cv_search_GeoIP_lib_version+:} false; then :
13743 +  $as_echo_n "(cached) " >&6
13744 + else
13745 +  ac_func_search_save_LIBS=$LIBS
13746 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13747 + /* end confdefs.h.  */
13748 +
13749 + /* Override any GCC internal prototype to avoid an error.
13750 +   Use char because int might match the return type of a GCC
13751 +   builtin and then its argument prototype would still apply.  */
13752 + #ifdef __cplusplus
13753 + extern "C"
13754 + #endif
13755 + char GeoIP_lib_version ();
13756 + int
13757 + main ()
13758 + {
13759 + return GeoIP_lib_version ();
13760 +  ;
13761 +  return 0;
13762 + }
13763 + _ACEOF
13764 + for ac_lib in '' GeoIP; do
13765 +  if test -z "$ac_lib"; then
13766 +    ac_res="none required"
13767 +  else
13768 +    ac_res=-l$ac_lib
13769 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13770 +  fi
13771 +  if ac_fn_c_try_link "$LINENO"; then :
13772 +  ac_cv_search_GeoIP_lib_version=$ac_res
13773 + fi
13774 + rm -f core conftest.err conftest.$ac_objext \
13775 +    conftest$ac_exeext
13776 +  if ${ac_cv_search_GeoIP_lib_version+:} false; then :
13777 +  break
13778 + fi
13779 + done
13780 + if ${ac_cv_search_GeoIP_lib_version+:} false; then :
13781 +
13782 + else
13783 +  ac_cv_search_GeoIP_lib_version=no
13784 + fi
13785 + rm conftest.$ac_ext
13786 + LIBS=$ac_func_search_save_LIBS
13787 + fi
13788 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_lib_version" >&5
13789 + $as_echo "$ac_cv_search_GeoIP_lib_version" >&6; }
13790 + ac_res=$ac_cv_search_GeoIP_lib_version
13791 + if test "$ac_res" != no; then :
13792 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13793 +
13794 + $as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
13795 +
13796 + fi
13797 +
13798 + fi
13799 +
13800 +
13801 + fi
13802 +
13803 +
13804   # Check whether --enable-openssl was given.
13805   if test "${enable_openssl+set}" = set; then :
13806    enableval=$enable_openssl;  cf_enable_openssl=$enableval
# Line 13771 | Line 13888 | fi
13888    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
13889   $as_echo "found" >&6; }
13890  
13891 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13892 < $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13893 < if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13891 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13892 > $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13893 > if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13894    $as_echo_n "(cached) " >&6
13895   else
13896    ac_check_lib_save_LIBS=$LIBS
13897 < LIBS="-lssl  $LIBS"
13897 > LIBS="-lcrypto  $LIBS"
13898   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13899   /* end confdefs.h.  */
13900  
# Line 13787 | Line 13904 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13904   #ifdef __cplusplus
13905   extern "C"
13906   #endif
13907 < char SSL_connect ();
13907 > char RSA_free ();
13908   int
13909   main ()
13910   {
13911 < return SSL_connect ();
13911 > return RSA_free ();
13912    ;
13913    return 0;
13914   }
13915   _ACEOF
13916   if ac_fn_c_try_link "$LINENO"; then :
13917 <  ac_cv_lib_ssl_SSL_connect=yes
13917 >  ac_cv_lib_crypto_RSA_free=yes
13918   else
13919 <  ac_cv_lib_ssl_SSL_connect=no
13919 >  ac_cv_lib_crypto_RSA_free=no
13920   fi
13921   rm -f core conftest.err conftest.$ac_objext \
13922      conftest$ac_exeext conftest.$ac_ext
13923   LIBS=$ac_check_lib_save_LIBS
13924   fi
13925 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13926 < $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13927 < if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13925 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13926 > $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13927 > if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13928    cat >>confdefs.h <<_ACEOF
13929 < #define HAVE_LIBSSL 1
13929 > #define HAVE_LIBCRYPTO 1
13930   _ACEOF
13931  
13932 <  LIBS="-lssl $LIBS"
13932 >  LIBS="-lcrypto $LIBS"
13933  
13934   fi
13935  
13936 <    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
13937 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13938 < $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13939 < if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13936 >    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
13937 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13938 > $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13939 > if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13940    $as_echo_n "(cached) " >&6
13941   else
13942    ac_check_lib_save_LIBS=$LIBS
13943 < LIBS="-lcrypto  $LIBS"
13943 > LIBS="-lssl  $LIBS"
13944   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13945   /* end confdefs.h.  */
13946  
# Line 13833 | Line 13950 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13950   #ifdef __cplusplus
13951   extern "C"
13952   #endif
13953 < char RSA_free ();
13953 > char SSL_connect ();
13954   int
13955   main ()
13956   {
13957 < return RSA_free ();
13957 > return SSL_connect ();
13958    ;
13959    return 0;
13960   }
13961   _ACEOF
13962   if ac_fn_c_try_link "$LINENO"; then :
13963 <  ac_cv_lib_crypto_RSA_free=yes
13963 >  ac_cv_lib_ssl_SSL_connect=yes
13964   else
13965 <  ac_cv_lib_crypto_RSA_free=no
13965 >  ac_cv_lib_ssl_SSL_connect=no
13966   fi
13967   rm -f core conftest.err conftest.$ac_objext \
13968      conftest$ac_exeext conftest.$ac_ext
13969   LIBS=$ac_check_lib_save_LIBS
13970   fi
13971 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13972 < $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13973 < if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13971 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13972 > $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13973 > if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13974    cat >>confdefs.h <<_ACEOF
13975 < #define HAVE_LIBCRYPTO 1
13975 > #define HAVE_LIBSSL 1
13976   _ACEOF
13977  
13978 <  LIBS="-lcrypto $LIBS"
13978 >  LIBS="-lssl $LIBS"
13979  
13980   fi
13981  
# Line 13871 | Line 13988 | $as_echo "no - OpenSSL support disabled"
13988   fi
13989   fi
13990  
13991 < if test "$ac_cv_lib_crypto_RSA_free" = yes; then
13991 > if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
13992    ENABLE_SSL_TRUE=
13993    ENABLE_SSL_FALSE='#'
13994   else
# Line 13896 | Line 14013 | $as_echo "#define NDEBUG 1" >>confdefs.h
14013   fi
14014  
14015  
13899 # Check whether --enable-small-net was given.
13900 if test "${enable_small_net+set}" = set; then :
13901  enableval=$enable_small_net; small_net=$enableval
13902 else
13903  small_net=no
13904 fi
13905
13906
13907 if test "$small_net" = "yes"; then :
13908
13909
13910 $as_echo "#define NICKNAMEHISTORYLENGTH 2048" >>confdefs.h
13911
13912
13913 $as_echo "#define CHANNEL_HEAP_SIZE 256" >>confdefs.h
13914
13915
13916 $as_echo "#define BAN_HEAP_SIZE 128" >>confdefs.h
13917
13918
13919 $as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h
13920
13921
13922 $as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
13923
13924
13925 $as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
13926
13927
13928 $as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
13929
13930
13931 $as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h
13932
13933
13934 $as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h
13935
13936
13937 $as_echo "#define DNS_HEAP_SIZE 128" >>confdefs.h
13938
13939 else
13940
13941
14016  
14017   $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h
14018  
# Line 13958 | Line 14032 | $as_echo "#define LCLIENT_HEAP_SIZE 512"
14032   $as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h
14033  
14034  
13961 $as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h
13962
13963
14035   $as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h
14036  
14037  
14038 < $as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h
14038 > $as_echo "#define AUTH_HEAP_SIZE 256" >>confdefs.h
14039  
14040  
14041 < $as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h
14041 > $as_echo "#define DNS_HEAP_SIZE 256" >>confdefs.h
14042  
13972 fi
14043  
14044  
14045   # Argument processing.
# Line 13990 | Line 14060 | if test "${enable_devpoll+set}" = set; t
14060    enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll"
14061   fi
14062  
13993  # Check whether --enable-rtsigio was given.
13994 if test "${enable_rtsigio+set}" = set; then :
13995  enableval=$enable_rtsigio; desired_iopoll_mechanism="rtsigio"
13996 fi
13997
14063    # Check whether --enable-poll was given.
14064   if test "${enable_poll+set}" = set; then :
14065    enableval=$enable_poll; desired_iopoll_mechanism="poll"
# Line 14178 | Line 14243 | rm -f core conftest.err conftest.$ac_obj
14243   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14244  
14245    fi
14246 <      iopoll_mechanism_rtsigio=4
14182 <
14183 < cat >>confdefs.h <<_ACEOF
14184 < #define __IOPOLL_MECHANISM_RTSIGIO $iopoll_mechanism_rtsigio
14185 < _ACEOF
14186 <
14187 <  if test "$cross_compiling" = yes; then :
14188 <  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14189 < $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14190 < as_fn_error $? "cannot run test program while cross compiling
14191 < See \`config.log' for more details" "$LINENO" 5; }
14192 < else
14193 <  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14194 < /* end confdefs.h.  */
14195 <
14196 < #define _GNU_SOURCE
14197 < #include <fcntl.h>
14198 < static unsigned int have_f_setsig = 0;
14199 <
14200 < int
14201 < main ()
14202 < {
14203 <
14204 < #ifdef F_SETSIG
14205 <  have_f_setsig = 1;
14206 < #endif
14207 <  return have_f_setsig == 0;
14208 <
14209 <  ;
14210 <  return 0;
14211 < }
14212 < _ACEOF
14213 < if ac_fn_c_try_run "$LINENO"; then :
14214 <  is_rtsigio_mechanism_available="yes"
14215 < else
14216 <  is_rtsigio_mechanism_available="no"
14217 < fi
14218 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14219 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
14220 < fi
14221 <
14222 <      iopoll_mechanism_poll=5
14246 >      iopoll_mechanism_poll=4
14247  
14248   cat >>confdefs.h <<_ACEOF
14249   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14273 | Line 14297 | else
14297   fi
14298   rm -f core conftest.err conftest.$ac_objext \
14299      conftest$ac_exeext conftest.$ac_ext
14300 <      iopoll_mechanism_select=6
14300 >      iopoll_mechanism_select=5
14301  
14302   cat >>confdefs.h <<_ACEOF
14303   #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
# Line 14328 | Line 14352 | fi
14352   rm -f core conftest.err conftest.$ac_objext \
14353      conftest$ac_exeext conftest.$ac_ext
14354        optimal_iopoll_mechanism="none"
14355 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
14355 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14356      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14357      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14358        optimal_iopoll_mechanism="$mechanism"
# Line 14365 | Line 14389 | _ACEOF
14389  
14390  
14391  
14368
14369 # Check whether --with-nicklen was given.
14370 if test "${with_nicklen+set}" = set; then :
14371  withval=$with_nicklen; nicklen="$withval"
14372 else
14373  nicklen="9"
14374 fi
14375
14376
14377 cat >>confdefs.h <<_ACEOF
14378 #define NICKLEN ($nicklen+1)
14379 _ACEOF
14380
14381
14382
14383
14384 # Check whether --with-topiclen was given.
14385 if test "${with_topiclen+set}" = set; then :
14386  withval=$with_topiclen; topiclen="$withval"
14387 else
14388  topiclen="160"
14389 fi
14390
14391
14392 cat >>confdefs.h <<_ACEOF
14393 #define TOPICLEN ($topiclen)
14394 _ACEOF
14395
14396
14397
14392    # Check whether --enable-halfops was given.
14393   if test "${enable_halfops+set}" = set; then :
14394    enableval=$enable_halfops; halfops="$enableval"
# Line 14417 | Line 14411 | else
14411   fi
14412  
14413    if test "$debugging" = "yes" ; then
14420
14421 $as_echo "#define DEBUG 1" >>confdefs.h
14422
14414      CFLAGS="-Wall -g -O0"
14424  else
14425
14426 $as_echo "#define NDEBUG 1" >>confdefs.h
14427
14415    fi
14416  
14417  
# Line 15093 | Line 15080 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
15080   # report actual input values of CONFIG_FILES etc. instead of their
15081   # values after options handling.
15082   ac_log="
15083 < This file was extended by ircd-hybrid $as_me 8beta1, which was
15083 > This file was extended by ircd-hybrid $as_me 8.0.7, which was
15084   generated by GNU Autoconf 2.69.  Invocation command line was
15085  
15086    CONFIG_FILES    = $CONFIG_FILES
# Line 15159 | Line 15146 | _ACEOF
15146   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15147   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15148   ac_cs_version="\\
15149 < ircd-hybrid config.status 8beta1
15149 > ircd-hybrid config.status 8.0.7
15150   configured by $0, generated by GNU Autoconf 2.69,
15151    with options \\"\$ac_cs_config\\"
15152  
# Line 16177 | Line 16164 | $as_echo "$as_me: executing $ac_file com
16164  
16165    case $ac_file$ac_mode in
16166      "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
16167 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
16167 >  # Older Autoconf quotes --file arguments for eval, but not when files
16168    # are listed without --file.  Let's play safe and only enable the eval
16169    # if we detect the quoting.
16170    case $CONFIG_FILES in

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)