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

Comparing:
ircd-hybrid-8/configure (file contents), Revision 1431 by michael, Sat Jun 9 19:15:10 2012 UTC vs.
ircd-hybrid/trunk/configure (file contents), Revision 2238 by michael, Sat Jun 15 19:19:33 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 2228 2013-06-13 19:46:30Z 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 TRUNK.
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='TRUNK'
597 > PACKAGE_STRING='ircd-hybrid TRUNK'
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 799 | Line 805 | with_included_ltdl
805   with_ltdl_include
806   with_ltdl_lib
807   enable_ltdl_install
808 < enable_libpcre
808 > enable_libGeoIP
809   enable_openssl
810   enable_assert
805 enable_small_net
811   enable_kqueue
812   enable_epoll
813   enable_devpoll
809 enable_rtsigio
814   enable_poll
815   enable_select
812 with_nicklen
813 with_topiclen
816   enable_halfops
817   enable_debugging
818   enable_warnings
# Line 1366 | Line 1368 | if test "$ac_init_help" = "long"; then
1368    # Omit some internal or obsolete options to make the list less imposing.
1369    # This message is too long to be a string in the A/UX 3.1 sh.
1370    cat <<_ACEOF
1371 < \`configure' configures ircd-hybrid 8beta1 to adapt to many kinds of systems.
1371 > \`configure' configures ircd-hybrid TRUNK to adapt to many kinds of systems.
1372  
1373   Usage: $0 [OPTION]... [VAR=VALUE]...
1374  
# Line 1436 | Line 1438 | fi
1438  
1439   if test -n "$ac_init_help"; then
1440    case $ac_init_help in
1441 <     short | recursive ) echo "Configuration of ircd-hybrid 8beta1:";;
1441 >     short | recursive ) echo "Configuration of ircd-hybrid TRUNK:";;
1442     esac
1443    cat <<\_ACEOF
1444  
# Line 1444 | Line 1446 | Optional Features:
1446    --disable-option-checking  ignore unrecognized --enable/--with options
1447    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1448    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1449 +  --enable-silent-rules   less verbose build output (undo: "make V=1")
1450 +  --disable-silent-rules  verbose build output (undo: "make V=0")
1451    --enable-maintainer-mode
1452                            enable make rules and dependencies not useful (and
1453                            sometimes confusing) to the casual installer
# Line 1457 | Line 1461 | Optional Features:
1461                            optimize for fast installation [default=yes]
1462    --disable-libtool-lock  avoid locking (might break parallel builds)
1463    --enable-ltdl-install   install libltdl
1464 <  --disable-libpcre       Disable PCRE support
1464 >  --disable-libgeoip      Disable GeoIP support
1465    --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
1466    --disable-openssl            Disable OpenSSL support.
1467    --enable-assert         Enable assert() statements
1464  --enable-small-net      Enable small network support.
1468    --enable-kqueue         Force kqueue usage.
1469    --enable-epoll          Force epoll usage.
1470    --enable-devpoll        Force devpoll usage.
1468  --enable-rtsigio        Force rtsigio usage.
1471    --enable-poll           Force poll usage.
1472    --enable-select         Force select usage.
1473    --enable-halfops        Enable halfops support.
# Line 1483 | Line 1485 | Optional Packages:
1485    --with-included-ltdl    use the GNU ltdl sources included here
1486    --with-ltdl-include=DIR use the ltdl headers installed in DIR
1487    --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).
1488  
1489   Some influential environment variables:
1490    CC          C compiler command
# Line 1568 | Line 1568 | fi
1568   test -n "$ac_init_help" && exit $ac_status
1569   if $ac_init_version; then
1570    cat <<\_ACEOF
1571 < ircd-hybrid configure 8beta1
1571 > ircd-hybrid configure TRUNK
1572   generated by GNU Autoconf 2.69
1573  
1574   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 2094 | Line 2094 | cat >config.log <<_ACEOF
2094   This file contains any messages produced by compilers while
2095   running configure, to aid debugging if configure makes a mistake.
2096  
2097 < It was created by ircd-hybrid $as_me 8beta1, which was
2097 > It was created by ircd-hybrid $as_me TRUNK, which was
2098   generated by GNU Autoconf 2.69.  Invocation command line was
2099  
2100    $ $0 $@
# Line 2374 | Line 2374 | $as_echo "$as_me: creating cache $cache_
2374    >$cache_file
2375   fi
2376  
2377 as_fn_append ac_func_list " mmap"
2377   as_fn_append ac_func_list " strtok_r"
2378   as_fn_append ac_func_list " usleep"
2379   as_fn_append ac_func_list " strlcat"
# Line 2454 | Line 2453 | ac_link='$CC -o conftest$ac_exeext $CFLA
2453   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2454  
2455  
2456 < am__api_version='1.12'
2456 > am__api_version='1.13'
2457  
2458   ac_aux_dir=
2459   for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
# Line 2667 | Line 2666 | if test x"${MISSING+set}" != xset; then
2666    esac
2667   fi
2668   # Use eval to expand $SHELL
2669 < if eval "$MISSING --run true"; then
2670 <  am_missing_run="$MISSING --run "
2669 > if eval "$MISSING --is-lightweight"; then
2670 >  am_missing_run="$MISSING "
2671   else
2672    am_missing_run=
2673    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
# Line 2908 | Line 2907 | else
2907   fi
2908   rmdir .tst 2>/dev/null
2909  
2910 + # Check whether --enable-silent-rules was given.
2911 + if test "${enable_silent_rules+set}" = set; then :
2912 +  enableval=$enable_silent_rules;
2913 + fi
2914 +
2915 + case $enable_silent_rules in # (((
2916 +  yes) AM_DEFAULT_VERBOSITY=0;;
2917 +   no) AM_DEFAULT_VERBOSITY=1;;
2918 +    *) AM_DEFAULT_VERBOSITY=1;;
2919 + esac
2920 + am_make=${MAKE-make}
2921 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2922 + $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2923 + if ${am_cv_make_support_nested_variables+:} false; then :
2924 +  $as_echo_n "(cached) " >&6
2925 + else
2926 +  if $as_echo 'TRUE=$(BAR$(V))
2927 + BAR0=false
2928 + BAR1=true
2929 + V=1
2930 + am__doit:
2931 +        @$(TRUE)
2932 + .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2933 +  am_cv_make_support_nested_variables=yes
2934 + else
2935 +  am_cv_make_support_nested_variables=no
2936 + fi
2937 + fi
2938 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2939 + $as_echo "$am_cv_make_support_nested_variables" >&6; }
2940 + if test $am_cv_make_support_nested_variables = yes; then
2941 +    AM_V='$(V)'
2942 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2943 + else
2944 +  AM_V=$AM_DEFAULT_VERBOSITY
2945 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2946 + fi
2947 + AM_BACKSLASH='\'
2948 +
2949   if test "`cd $srcdir && pwd`" != "`pwd`"; then
2950    # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2951    # is not polluted with repeated "-I."
# Line 2930 | Line 2968 | fi
2968  
2969   # Define the identity of the package.
2970   PACKAGE='ircd-hybrid'
2971 < VERSION='8beta1'
2971 > VERSION='TRUNK'
2972  
2973  
2974   cat >>confdefs.h <<_ACEOF
# Line 2958 | Line 2996 | AUTOHEADER=${AUTOHEADER-"${am_missing_ru
2996  
2997   MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2998  
2999 + # For better backward compatibility.  To be removed once Automake 1.9.x
3000 + # dies out for good.  For more background, see:
3001 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3002 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3003 + mkdir_p='$(MKDIR_P)'
3004 +
3005   # We need awk for the "check" target.  The system "awk" is bad on
3006   # some platforms.
3007   # Always define AMTAR for backward compatibility.  Yes, it's still used
3008   # in the wild :-(  We should find a proper way to deprecate it ...
3009   AMTAR='$${TAR-tar}'
3010  
3011 +
3012 + # We'll loop over all known methods to create a tar archive until one works.
3013 + _am_tools='gnutar  pax cpio none'
3014 +
3015   am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
3016  
3017  
# Line 2971 | Line 3019 | am__tar='$${TAR-tar} chof - "$$tardir"'
3019  
3020  
3021  
3022 +
3023   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3024   $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3025      # Check whether --enable-maintainer-mode was given.
# Line 13023 | Line 13072 | LIBTOOL="$LIBTOOL --silent"
13072  
13073   # Checks for libraries.
13074  
13075 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13076 < $as_echo_n "checking for library containing socket... " >&6; }
13077 < if ${ac_cv_search_socket+:} false; then :
13075 >  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13076 > if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13077 >
13078 > else
13079 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
13080 > $as_echo_n "checking for library containing getaddrinfo... " >&6; }
13081 > if ${ac_cv_search_getaddrinfo+:} false; then :
13082    $as_echo_n "(cached) " >&6
13083   else
13084    ac_func_search_save_LIBS=$LIBS
# Line 13038 | Line 13091 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13091   #ifdef __cplusplus
13092   extern "C"
13093   #endif
13094 < char socket ();
13094 > char getaddrinfo ();
13095   int
13096   main ()
13097   {
13098 < return socket ();
13098 > return getaddrinfo ();
13099    ;
13100    return 0;
13101   }
13102   _ACEOF
13103 < for ac_lib in '' socket; do
13103 > for ac_lib in '' nsl; do
13104    if test -z "$ac_lib"; then
13105      ac_res="none required"
13106    else
# Line 13055 | Line 13108 | for ac_lib in '' socket; do
13108      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13109    fi
13110    if ac_fn_c_try_link "$LINENO"; then :
13111 <  ac_cv_search_socket=$ac_res
13111 >  ac_cv_search_getaddrinfo=$ac_res
13112   fi
13113   rm -f core conftest.err conftest.$ac_objext \
13114      conftest$ac_exeext
13115 <  if ${ac_cv_search_socket+:} false; then :
13115 >  if ${ac_cv_search_getaddrinfo+:} false; then :
13116    break
13117   fi
13118   done
13119 < if ${ac_cv_search_socket+:} false; then :
13119 > if ${ac_cv_search_getaddrinfo+:} false; then :
13120  
13121   else
13122 <  ac_cv_search_socket=no
13122 >  ac_cv_search_getaddrinfo=no
13123   fi
13124   rm conftest.$ac_ext
13125   LIBS=$ac_func_search_save_LIBS
13126   fi
13127 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13128 < $as_echo "$ac_cv_search_socket" >&6; }
13129 < ac_res=$ac_cv_search_socket
13127 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
13128 > $as_echo "$ac_cv_search_getaddrinfo" >&6; }
13129 > ac_res=$ac_cv_search_getaddrinfo
13130   if test "$ac_res" != no; then :
13131    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13132  
13080 else
13081  as_fn_error $? "socket library not found" "$LINENO" 5
13133   fi
13134  
13135 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
13136 < $as_echo_n "checking for library containing inet_ntoa... " >&6; }
13137 < if ${ac_cv_search_inet_ntoa+:} false; then :
13135 > fi
13136 >
13137 >  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
13138 > if test "x$ac_cv_func_getnameinfo" = xyes; then :
13139 >
13140 > else
13141 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
13142 > $as_echo_n "checking for library containing getnameinfo... " >&6; }
13143 > if ${ac_cv_search_getnameinfo+:} false; then :
13144    $as_echo_n "(cached) " >&6
13145   else
13146    ac_func_search_save_LIBS=$LIBS
# Line 13096 | Line 13153 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13153   #ifdef __cplusplus
13154   extern "C"
13155   #endif
13156 < char inet_ntoa ();
13156 > char getnameinfo ();
13157   int
13158   main ()
13159   {
13160 < return inet_ntoa ();
13160 > return getnameinfo ();
13161    ;
13162    return 0;
13163   }
# Line 13113 | Line 13170 | for ac_lib in '' nsl; do
13170      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13171    fi
13172    if ac_fn_c_try_link "$LINENO"; then :
13173 <  ac_cv_search_inet_ntoa=$ac_res
13173 >  ac_cv_search_getnameinfo=$ac_res
13174   fi
13175   rm -f core conftest.err conftest.$ac_objext \
13176      conftest$ac_exeext
13177 <  if ${ac_cv_search_inet_ntoa+:} false; then :
13177 >  if ${ac_cv_search_getnameinfo+:} false; then :
13178    break
13179   fi
13180   done
13181 < if ${ac_cv_search_inet_ntoa+:} false; then :
13181 > if ${ac_cv_search_getnameinfo+:} false; then :
13182  
13183   else
13184 <  ac_cv_search_inet_ntoa=no
13184 >  ac_cv_search_getnameinfo=no
13185   fi
13186   rm conftest.$ac_ext
13187   LIBS=$ac_func_search_save_LIBS
13188   fi
13189 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5
13190 < $as_echo "$ac_cv_search_inet_ntoa" >&6; }
13191 < ac_res=$ac_cv_search_inet_ntoa
13189 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5
13190 > $as_echo "$ac_cv_search_getnameinfo" >&6; }
13191 > ac_res=$ac_cv_search_getnameinfo
13192   if test "$ac_res" != no; then :
13193    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13194  
13195   fi
13196  
13197 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
13198 < $as_echo_n "checking for library containing inet_aton... " >&6; }
13199 < if ${ac_cv_search_inet_aton+:} false; then :
13197 > fi
13198 >
13199 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13200 > $as_echo_n "checking for library containing socket... " >&6; }
13201 > if ${ac_cv_search_socket+:} false; then :
13202    $as_echo_n "(cached) " >&6
13203   else
13204    ac_func_search_save_LIBS=$LIBS
# Line 13152 | Line 13211 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13211   #ifdef __cplusplus
13212   extern "C"
13213   #endif
13214 < char inet_aton ();
13214 > char socket ();
13215   int
13216   main ()
13217   {
13218 < return inet_aton ();
13218 > return socket ();
13219    ;
13220    return 0;
13221   }
13222   _ACEOF
13223 < for ac_lib in '' resolv; do
13223 > for ac_lib in '' socket; do
13224    if test -z "$ac_lib"; then
13225      ac_res="none required"
13226    else
# Line 13169 | Line 13228 | for ac_lib in '' resolv; do
13228      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13229    fi
13230    if ac_fn_c_try_link "$LINENO"; then :
13231 <  ac_cv_search_inet_aton=$ac_res
13231 >  ac_cv_search_socket=$ac_res
13232   fi
13233   rm -f core conftest.err conftest.$ac_objext \
13234      conftest$ac_exeext
13235 <  if ${ac_cv_search_inet_aton+:} false; then :
13235 >  if ${ac_cv_search_socket+:} false; then :
13236    break
13237   fi
13238   done
13239 < if ${ac_cv_search_inet_aton+:} false; then :
13239 > if ${ac_cv_search_socket+:} false; then :
13240  
13241   else
13242 <  ac_cv_search_inet_aton=no
13242 >  ac_cv_search_socket=no
13243   fi
13244   rm conftest.$ac_ext
13245   LIBS=$ac_func_search_save_LIBS
13246   fi
13247 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
13248 < $as_echo "$ac_cv_search_inet_aton" >&6; }
13249 < ac_res=$ac_cv_search_inet_aton
13247 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13248 > $as_echo "$ac_cv_search_socket" >&6; }
13249 > ac_res=$ac_cv_search_socket
13250   if test "$ac_res" != no; then :
13251    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13252  
13253 + else
13254 +  as_fn_error $? "socket library not found" "$LINENO" 5
13255   fi
13256  
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
13257    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13258     #include <sys/socket.h>
13259     #include <netdb.h>
# Line 13521 | Line 13570 | done
13570  
13571  
13572  
13524
13525
13573   # Checks for header files.
13574  
13575  
# Line 13614 | Line 13661 | if test "$ac_res" != no; then :
13661   fi
13662  
13663  
13664 < # Check whether --enable-libpcre was given.
13665 < if test "${enable_libpcre+set}" = set; then :
13666 <  enableval=$enable_libpcre;
13667 < else
13668 <  ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
13669 < if test "x$ac_cv_header_pcre_h" = xyes; then :
13670 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pcre_study" >&5
13671 < $as_echo_n "checking for library containing pcre_study... " >&6; }
13672 < if ${ac_cv_search_pcre_study+:} false; then :
13664 > # Check whether --enable-libGeoIP was given.
13665 > if test "${enable_libGeoIP+set}" = set; then :
13666 >  enableval=$enable_libGeoIP;
13667 > else
13668 >  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13669 > if test "x$ac_cv_header_GeoIP_h" = xyes; then :
13670 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
13671 > $as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
13672 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13673    $as_echo_n "(cached) " >&6
13674   else
13675    ac_func_search_save_LIBS=$LIBS
# Line 13635 | Line 13682 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13682   #ifdef __cplusplus
13683   extern "C"
13684   #endif
13685 < char pcre_study ();
13685 > char GeoIP_id_by_ipnum_v6_gl ();
13686   int
13687   main ()
13688   {
13689 < return pcre_study ();
13689 > return GeoIP_id_by_ipnum_v6_gl ();
13690    ;
13691    return 0;
13692   }
13693   _ACEOF
13694 < for ac_lib in '' pcre; do
13694 > for ac_lib in '' GeoIP; do
13695    if test -z "$ac_lib"; then
13696      ac_res="none required"
13697    else
# Line 13652 | Line 13699 | for ac_lib in '' pcre; do
13699      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13700    fi
13701    if ac_fn_c_try_link "$LINENO"; then :
13702 <  ac_cv_search_pcre_study=$ac_res
13702 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
13703   fi
13704   rm -f core conftest.err conftest.$ac_objext \
13705      conftest$ac_exeext
13706 <  if ${ac_cv_search_pcre_study+:} false; then :
13706 >  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13707    break
13708   fi
13709   done
13710 < if ${ac_cv_search_pcre_study+:} false; then :
13710 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13711  
13712   else
13713 <  ac_cv_search_pcre_study=no
13713 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
13714   fi
13715   rm conftest.$ac_ext
13716   LIBS=$ac_func_search_save_LIBS
13717   fi
13718 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pcre_study" >&5
13719 < $as_echo "$ac_cv_search_pcre_study" >&6; }
13720 < ac_res=$ac_cv_search_pcre_study
13718 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
13719 > $as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
13720 > ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
13721   if test "$ac_res" != no; then :
13722    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13723  
13724 < $as_echo "#define HAVE_LIBPCRE 1" >>confdefs.h
13724 > $as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
13725  
13726   fi
13727  
# Line 13771 | Line 13818 | fi
13818    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
13819   $as_echo "found" >&6; }
13820  
13821 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13822 < $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13823 < if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13821 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13822 > $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13823 > if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13824    $as_echo_n "(cached) " >&6
13825   else
13826    ac_check_lib_save_LIBS=$LIBS
13827 < LIBS="-lssl  $LIBS"
13827 > LIBS="-lcrypto  $LIBS"
13828   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13829   /* end confdefs.h.  */
13830  
# Line 13787 | Line 13834 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13834   #ifdef __cplusplus
13835   extern "C"
13836   #endif
13837 < char SSL_connect ();
13837 > char RSA_free ();
13838   int
13839   main ()
13840   {
13841 < return SSL_connect ();
13841 > return RSA_free ();
13842    ;
13843    return 0;
13844   }
13845   _ACEOF
13846   if ac_fn_c_try_link "$LINENO"; then :
13847 <  ac_cv_lib_ssl_SSL_connect=yes
13847 >  ac_cv_lib_crypto_RSA_free=yes
13848   else
13849 <  ac_cv_lib_ssl_SSL_connect=no
13849 >  ac_cv_lib_crypto_RSA_free=no
13850   fi
13851   rm -f core conftest.err conftest.$ac_objext \
13852      conftest$ac_exeext conftest.$ac_ext
13853   LIBS=$ac_check_lib_save_LIBS
13854   fi
13855 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13856 < $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13857 < if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13855 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13856 > $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13857 > if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13858    cat >>confdefs.h <<_ACEOF
13859 < #define HAVE_LIBSSL 1
13859 > #define HAVE_LIBCRYPTO 1
13860   _ACEOF
13861  
13862 <  LIBS="-lssl $LIBS"
13862 >  LIBS="-lcrypto $LIBS"
13863  
13864   fi
13865  
13866 <    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
13867 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13868 < $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13869 < if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13866 >    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
13867 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13868 > $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13869 > if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13870    $as_echo_n "(cached) " >&6
13871   else
13872    ac_check_lib_save_LIBS=$LIBS
13873 < LIBS="-lcrypto  $LIBS"
13873 > LIBS="-lssl  $LIBS"
13874   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13875   /* end confdefs.h.  */
13876  
# Line 13833 | Line 13880 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13880   #ifdef __cplusplus
13881   extern "C"
13882   #endif
13883 < char RSA_free ();
13883 > char SSL_connect ();
13884   int
13885   main ()
13886   {
13887 < return RSA_free ();
13887 > return SSL_connect ();
13888    ;
13889    return 0;
13890   }
13891   _ACEOF
13892   if ac_fn_c_try_link "$LINENO"; then :
13893 <  ac_cv_lib_crypto_RSA_free=yes
13893 >  ac_cv_lib_ssl_SSL_connect=yes
13894   else
13895 <  ac_cv_lib_crypto_RSA_free=no
13895 >  ac_cv_lib_ssl_SSL_connect=no
13896   fi
13897   rm -f core conftest.err conftest.$ac_objext \
13898      conftest$ac_exeext conftest.$ac_ext
13899   LIBS=$ac_check_lib_save_LIBS
13900   fi
13901 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13902 < $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13903 < if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13901 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13902 > $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13903 > if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13904    cat >>confdefs.h <<_ACEOF
13905 < #define HAVE_LIBCRYPTO 1
13905 > #define HAVE_LIBSSL 1
13906   _ACEOF
13907  
13908 <  LIBS="-lcrypto $LIBS"
13908 >  LIBS="-lssl $LIBS"
13909  
13910   fi
13911  
# Line 13871 | Line 13918 | $as_echo "no - OpenSSL support disabled"
13918   fi
13919   fi
13920  
13921 < if test "$ac_cv_lib_crypto_RSA_free" = yes; then
13921 > if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
13922    ENABLE_SSL_TRUE=
13923    ENABLE_SSL_FALSE='#'
13924   else
# Line 13896 | Line 13943 | $as_echo "#define NDEBUG 1" >>confdefs.h
13943   fi
13944  
13945  
13946 < # 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
13946 > $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
13947  
13948  
13949 < $as_echo "#define BAN_HEAP_SIZE 128" >>confdefs.h
13949 > $as_echo "#define MP_CHUNK_SIZE_CHANNEL 1024*1024" >>confdefs.h
13950  
13951  
13952 < $as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h
13952 > $as_echo "#define MP_CHUNK_SIZE_MEMBER 2048*1024" >>confdefs.h
13953  
13954  
13955 < $as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
13955 > $as_echo "#define MP_CHUNK_SIZE_BAN 1024*1024" >>confdefs.h
13956  
13957  
13958 < $as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
13958 > $as_echo "#define MP_CHUNK_SIZE_CLIENT 1024*1024" >>confdefs.h
13959  
13960  
13961 < $as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
13961 > $as_echo "#define MP_CHUNK_SIZE_LCLIENT 512*1024" >>confdefs.h
13962  
13963  
13964 < $as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h
13964 > $as_echo "#define MP_CHUNK_SIZE_DNODE 32*1024" >>confdefs.h
13965  
13966  
13967 < $as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h
13967 > $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
13968  
13969  
13970 < $as_echo "#define DNS_HEAP_SIZE 128" >>confdefs.h
13938 <
13939 < else
13940 <
13941 <
13942 <
13943 < $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h
13944 <
13945 <
13946 < $as_echo "#define CHANNEL_HEAP_SIZE 1024" >>confdefs.h
13970 > $as_echo "#define MP_CHUNK_SIZE_AUTH 128*1024" >>confdefs.h
13971  
13972  
13973 < $as_echo "#define BAN_HEAP_SIZE 1024" >>confdefs.h
13973 > $as_echo "#define MP_CHUNK_SIZE_DNS 64*1024" >>confdefs.h
13974  
13975  
13976 < $as_echo "#define CLIENT_HEAP_SIZE 1024" >>confdefs.h
13976 > $as_echo "#define MP_CHUNK_SIZE_WATCH 8*1024" >>confdefs.h
13977  
13978  
13979 < $as_echo "#define LCLIENT_HEAP_SIZE 512" >>confdefs.h
13979 > $as_echo "#define MP_CHUNK_SIZE_NAMEHOST 64*1024" >>confdefs.h
13980  
13981  
13982 < $as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h
13982 > $as_echo "#define MP_CHUNK_SIZE_USERHOST 128*1024" >>confdefs.h
13983  
13984  
13985 < $as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h
13962 <
13963 <
13964 < $as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h
13965 <
13966 <
13967 < $as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h
13968 <
13969 <
13970 < $as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h
13971 <
13972 < fi
13985 > $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY 128*1024" >>confdefs.h
13986  
13987  
13988   # Argument processing.
# Line 13990 | Line 14003 | if test "${enable_devpoll+set}" = set; t
14003    enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll"
14004   fi
14005  
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
14006    # Check whether --enable-poll was given.
14007   if test "${enable_poll+set}" = set; then :
14008    enableval=$enable_poll; desired_iopoll_mechanism="poll"
# Line 14178 | Line 14186 | rm -f core conftest.err conftest.$ac_obj
14186   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14187  
14188    fi
14189 <      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
14189 >      iopoll_mechanism_poll=4
14190  
14191   cat >>confdefs.h <<_ACEOF
14192   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14273 | Line 14240 | else
14240   fi
14241   rm -f core conftest.err conftest.$ac_objext \
14242      conftest$ac_exeext conftest.$ac_ext
14243 <      iopoll_mechanism_select=6
14243 >      iopoll_mechanism_select=5
14244  
14245   cat >>confdefs.h <<_ACEOF
14246   #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
# Line 14328 | Line 14295 | fi
14295   rm -f core conftest.err conftest.$ac_objext \
14296      conftest$ac_exeext conftest.$ac_ext
14297        optimal_iopoll_mechanism="none"
14298 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
14298 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14299      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14300      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14301        optimal_iopoll_mechanism="$mechanism"
# Line 14365 | Line 14332 | _ACEOF
14332  
14333  
14334  
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)
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
14335    # Check whether --enable-halfops was given.
14336   if test "${enable_halfops+set}" = set; then :
14337    enableval=$enable_halfops; halfops="$enableval"
# Line 14417 | Line 14354 | else
14354   fi
14355  
14356    if test "$debugging" = "yes" ; then
14420
14421 $as_echo "#define DEBUG 1" >>confdefs.h
14422
14357      CFLAGS="-Wall -g -O0"
14424  else
14425
14426 $as_echo "#define NDEBUG 1" >>confdefs.h
14427
14358    fi
14359  
14360  
# Line 14526 | Line 14456 | _ACEOF
14456    test "$exec_prefix_NONE" && exec_prefix=NONE
14457  
14458  
14459 < ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/help/Makefile src/Makefile libltdl/Makefile messages/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile help/opers/Makefile help/users/Makefile tools/Makefile"
14459 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile tools/Makefile"
14460  
14461  
14462   cat >confcache <<\_ACEOF
# Line 15093 | Line 15023 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
15023   # report actual input values of CONFIG_FILES etc. instead of their
15024   # values after options handling.
15025   ac_log="
15026 < This file was extended by ircd-hybrid $as_me 8beta1, which was
15026 > This file was extended by ircd-hybrid $as_me TRUNK, which was
15027   generated by GNU Autoconf 2.69.  Invocation command line was
15028  
15029    CONFIG_FILES    = $CONFIG_FILES
# Line 15159 | Line 15089 | _ACEOF
15089   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15090   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15091   ac_cs_version="\\
15092 < ircd-hybrid config.status 8beta1
15092 > ircd-hybrid config.status TRUNK
15093   configured by $0, generated by GNU Autoconf 2.69,
15094    with options \\"\$ac_cs_config\\"
15095  
# Line 15569 | Line 15499 | do
15499      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
15500      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
15501      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
15572    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
15573    "contrib/help/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/help/Makefile" ;;
15502      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
15503      "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
15576    "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;;
15504      "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
15505      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
15506      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
15507      "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
15581    "help/opers/Makefile") CONFIG_FILES="$CONFIG_FILES help/opers/Makefile" ;;
15582    "help/users/Makefile") CONFIG_FILES="$CONFIG_FILES help/users/Makefile" ;;
15508      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
15509  
15510    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
# Line 16177 | Line 16102 | $as_echo "$as_me: executing $ac_file com
16102  
16103    case $ac_file$ac_mode in
16104      "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
16105 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
16105 >  # Older Autoconf quotes --file arguments for eval, but not when files
16106    # are listed without --file.  Let's play safe and only enable the eval
16107    # if we detect the quoting.
16108    case $CONFIG_FILES in
# Line 16228 | Line 16153 | $as_echo X"$mf" |
16153      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
16154      test -z "$DEPDIR" && continue
16155      am__include=`sed -n 's/^am__include = //p' < "$mf"`
16156 <    test -z "am__include" && continue
16156 >    test -z "$am__include" && continue
16157      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
16158      # Find all dependency output files, they are included files with
16159      # $(DEPDIR) in their names.  We invoke sed twice because it is the

Comparing:
ircd-hybrid-8/configure (property svn:eol-style), Revision 1431 by michael, Sat Jun 9 19:15:10 2012 UTC vs.
ircd-hybrid/trunk/configure (property svn:eol-style), Revision 2238 by michael, Sat Jun 15 19:19:33 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

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