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 1921 by michael, Tue Apr 30 14:54:20 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 1908 2013-04-27 21:25:11Z 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
# Line 13023 | Line 13067 | LIBTOOL="$LIBTOOL --silent"
13067  
13068   # Checks for libraries.
13069  
13070 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13071 < $as_echo_n "checking for library containing socket... " >&6; }
13072 < if ${ac_cv_search_socket+:} false; then :
13070 >  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13071 > if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13072 >
13073 > else
13074 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
13075 > $as_echo_n "checking for library containing getaddrinfo... " >&6; }
13076 > if ${ac_cv_search_getaddrinfo+:} false; then :
13077    $as_echo_n "(cached) " >&6
13078   else
13079    ac_func_search_save_LIBS=$LIBS
# Line 13038 | Line 13086 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13086   #ifdef __cplusplus
13087   extern "C"
13088   #endif
13089 < char socket ();
13089 > char getaddrinfo ();
13090   int
13091   main ()
13092   {
13093 < return socket ();
13093 > return getaddrinfo ();
13094    ;
13095    return 0;
13096   }
13097   _ACEOF
13098 < for ac_lib in '' socket; do
13098 > for ac_lib in '' nsl; do
13099    if test -z "$ac_lib"; then
13100      ac_res="none required"
13101    else
# Line 13055 | Line 13103 | for ac_lib in '' socket; do
13103      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13104    fi
13105    if ac_fn_c_try_link "$LINENO"; then :
13106 <  ac_cv_search_socket=$ac_res
13106 >  ac_cv_search_getaddrinfo=$ac_res
13107   fi
13108   rm -f core conftest.err conftest.$ac_objext \
13109      conftest$ac_exeext
13110 <  if ${ac_cv_search_socket+:} false; then :
13110 >  if ${ac_cv_search_getaddrinfo+:} false; then :
13111    break
13112   fi
13113   done
13114 < if ${ac_cv_search_socket+:} false; then :
13114 > if ${ac_cv_search_getaddrinfo+:} false; then :
13115  
13116   else
13117 <  ac_cv_search_socket=no
13117 >  ac_cv_search_getaddrinfo=no
13118   fi
13119   rm conftest.$ac_ext
13120   LIBS=$ac_func_search_save_LIBS
13121   fi
13122 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13123 < $as_echo "$ac_cv_search_socket" >&6; }
13124 < ac_res=$ac_cv_search_socket
13122 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
13123 > $as_echo "$ac_cv_search_getaddrinfo" >&6; }
13124 > ac_res=$ac_cv_search_getaddrinfo
13125   if test "$ac_res" != no; then :
13126    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13127  
13080 else
13081  as_fn_error $? "socket library not found" "$LINENO" 5
13128   fi
13129  
13130 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
13131 < $as_echo_n "checking for library containing inet_ntoa... " >&6; }
13132 < if ${ac_cv_search_inet_ntoa+:} false; then :
13130 > fi
13131 >
13132 >  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
13133 > if test "x$ac_cv_func_getnameinfo" = xyes; then :
13134 >
13135 > else
13136 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
13137 > $as_echo_n "checking for library containing getnameinfo... " >&6; }
13138 > if ${ac_cv_search_getnameinfo+:} false; then :
13139    $as_echo_n "(cached) " >&6
13140   else
13141    ac_func_search_save_LIBS=$LIBS
# Line 13096 | Line 13148 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13148   #ifdef __cplusplus
13149   extern "C"
13150   #endif
13151 < char inet_ntoa ();
13151 > char getnameinfo ();
13152   int
13153   main ()
13154   {
13155 < return inet_ntoa ();
13155 > return getnameinfo ();
13156    ;
13157    return 0;
13158   }
# Line 13113 | Line 13165 | for ac_lib in '' nsl; do
13165      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13166    fi
13167    if ac_fn_c_try_link "$LINENO"; then :
13168 <  ac_cv_search_inet_ntoa=$ac_res
13168 >  ac_cv_search_getnameinfo=$ac_res
13169   fi
13170   rm -f core conftest.err conftest.$ac_objext \
13171      conftest$ac_exeext
13172 <  if ${ac_cv_search_inet_ntoa+:} false; then :
13172 >  if ${ac_cv_search_getnameinfo+:} false; then :
13173    break
13174   fi
13175   done
13176 < if ${ac_cv_search_inet_ntoa+:} false; then :
13176 > if ${ac_cv_search_getnameinfo+:} false; then :
13177  
13178   else
13179 <  ac_cv_search_inet_ntoa=no
13179 >  ac_cv_search_getnameinfo=no
13180   fi
13181   rm conftest.$ac_ext
13182   LIBS=$ac_func_search_save_LIBS
13183   fi
13184 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5
13185 < $as_echo "$ac_cv_search_inet_ntoa" >&6; }
13186 < ac_res=$ac_cv_search_inet_ntoa
13184 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5
13185 > $as_echo "$ac_cv_search_getnameinfo" >&6; }
13186 > ac_res=$ac_cv_search_getnameinfo
13187   if test "$ac_res" != no; then :
13188    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13189  
13190   fi
13191  
13192 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
13193 < $as_echo_n "checking for library containing inet_aton... " >&6; }
13194 < if ${ac_cv_search_inet_aton+:} false; then :
13192 > fi
13193 >
13194 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13195 > $as_echo_n "checking for library containing socket... " >&6; }
13196 > if ${ac_cv_search_socket+:} false; then :
13197    $as_echo_n "(cached) " >&6
13198   else
13199    ac_func_search_save_LIBS=$LIBS
# Line 13152 | Line 13206 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13206   #ifdef __cplusplus
13207   extern "C"
13208   #endif
13209 < char inet_aton ();
13209 > char socket ();
13210   int
13211   main ()
13212   {
13213 < return inet_aton ();
13213 > return socket ();
13214    ;
13215    return 0;
13216   }
13217   _ACEOF
13218 < for ac_lib in '' resolv; do
13218 > for ac_lib in '' socket; do
13219    if test -z "$ac_lib"; then
13220      ac_res="none required"
13221    else
# Line 13169 | Line 13223 | for ac_lib in '' resolv; do
13223      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13224    fi
13225    if ac_fn_c_try_link "$LINENO"; then :
13226 <  ac_cv_search_inet_aton=$ac_res
13226 >  ac_cv_search_socket=$ac_res
13227   fi
13228   rm -f core conftest.err conftest.$ac_objext \
13229      conftest$ac_exeext
13230 <  if ${ac_cv_search_inet_aton+:} false; then :
13230 >  if ${ac_cv_search_socket+:} false; then :
13231    break
13232   fi
13233   done
13234 < if ${ac_cv_search_inet_aton+:} false; then :
13234 > if ${ac_cv_search_socket+:} false; then :
13235  
13236   else
13237 <  ac_cv_search_inet_aton=no
13237 >  ac_cv_search_socket=no
13238   fi
13239   rm conftest.$ac_ext
13240   LIBS=$ac_func_search_save_LIBS
13241   fi
13242 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
13243 < $as_echo "$ac_cv_search_inet_aton" >&6; }
13244 < ac_res=$ac_cv_search_inet_aton
13242 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13243 > $as_echo "$ac_cv_search_socket" >&6; }
13244 > ac_res=$ac_cv_search_socket
13245   if test "$ac_res" != no; then :
13246    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13247  
13248 + else
13249 +  as_fn_error $? "socket library not found" "$LINENO" 5
13250   fi
13251  
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
13252    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13253     #include <sys/socket.h>
13254     #include <netdb.h>
# Line 13521 | Line 13565 | done
13565  
13566  
13567  
13524
13525
13568   # Checks for header files.
13569  
13570  
# Line 13614 | Line 13656 | if test "$ac_res" != no; then :
13656   fi
13657  
13658  
13659 < # Check whether --enable-libpcre was given.
13660 < if test "${enable_libpcre+set}" = set; then :
13661 <  enableval=$enable_libpcre;
13662 < else
13663 <  ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
13664 < if test "x$ac_cv_header_pcre_h" = xyes; then :
13665 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pcre_study" >&5
13666 < $as_echo_n "checking for library containing pcre_study... " >&6; }
13667 < if ${ac_cv_search_pcre_study+:} false; then :
13659 > # Check whether --enable-libGeoIP was given.
13660 > if test "${enable_libGeoIP+set}" = set; then :
13661 >  enableval=$enable_libGeoIP;
13662 > else
13663 >  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13664 > if test "x$ac_cv_header_GeoIP_h" = xyes; then :
13665 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
13666 > $as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
13667 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13668    $as_echo_n "(cached) " >&6
13669   else
13670    ac_func_search_save_LIBS=$LIBS
# Line 13635 | Line 13677 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13677   #ifdef __cplusplus
13678   extern "C"
13679   #endif
13680 < char pcre_study ();
13680 > char GeoIP_id_by_ipnum_v6_gl ();
13681   int
13682   main ()
13683   {
13684 < return pcre_study ();
13684 > return GeoIP_id_by_ipnum_v6_gl ();
13685    ;
13686    return 0;
13687   }
13688   _ACEOF
13689 < for ac_lib in '' pcre; do
13689 > for ac_lib in '' GeoIP; do
13690    if test -z "$ac_lib"; then
13691      ac_res="none required"
13692    else
# Line 13652 | Line 13694 | for ac_lib in '' pcre; do
13694      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13695    fi
13696    if ac_fn_c_try_link "$LINENO"; then :
13697 <  ac_cv_search_pcre_study=$ac_res
13697 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
13698   fi
13699   rm -f core conftest.err conftest.$ac_objext \
13700      conftest$ac_exeext
13701 <  if ${ac_cv_search_pcre_study+:} false; then :
13701 >  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13702    break
13703   fi
13704   done
13705 < if ${ac_cv_search_pcre_study+:} false; then :
13705 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13706  
13707   else
13708 <  ac_cv_search_pcre_study=no
13708 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
13709   fi
13710   rm conftest.$ac_ext
13711   LIBS=$ac_func_search_save_LIBS
13712   fi
13713 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pcre_study" >&5
13714 < $as_echo "$ac_cv_search_pcre_study" >&6; }
13715 < ac_res=$ac_cv_search_pcre_study
13713 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
13714 > $as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
13715 > ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
13716   if test "$ac_res" != no; then :
13717    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13718  
13719 < $as_echo "#define HAVE_LIBPCRE 1" >>confdefs.h
13719 > $as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
13720  
13721   fi
13722  
# Line 13738 | Line 13780 | $as_echo "disabled" >&6; }
13780   fi
13781  
13782   if test "$cf_enable_openssl" != "no"; then :
13783 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
13784 < $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
13783 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8s or above" >&5
13784 > $as_echo_n "checking for OpenSSL 0.9.8s or above... " >&6; }
13785    if test "$cross_compiling" = yes; then :
13786    cf_openssl_version_ok=no
13787   else
# Line 13752 | Line 13794 | else
13794   int
13795   main ()
13796   {
13797 < exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
13797 > exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f));
13798    ;
13799    return 0;
13800   }
# Line 13771 | Line 13813 | fi
13813    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
13814   $as_echo "found" >&6; }
13815  
13816 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13817 < $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13818 < if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13816 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13817 > $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13818 > if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13819    $as_echo_n "(cached) " >&6
13820   else
13821    ac_check_lib_save_LIBS=$LIBS
13822 < LIBS="-lssl  $LIBS"
13822 > LIBS="-lcrypto  $LIBS"
13823   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13824   /* end confdefs.h.  */
13825  
# Line 13787 | Line 13829 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13829   #ifdef __cplusplus
13830   extern "C"
13831   #endif
13832 < char SSL_connect ();
13832 > char RSA_free ();
13833   int
13834   main ()
13835   {
13836 < return SSL_connect ();
13836 > return RSA_free ();
13837    ;
13838    return 0;
13839   }
13840   _ACEOF
13841   if ac_fn_c_try_link "$LINENO"; then :
13842 <  ac_cv_lib_ssl_SSL_connect=yes
13842 >  ac_cv_lib_crypto_RSA_free=yes
13843   else
13844 <  ac_cv_lib_ssl_SSL_connect=no
13844 >  ac_cv_lib_crypto_RSA_free=no
13845   fi
13846   rm -f core conftest.err conftest.$ac_objext \
13847      conftest$ac_exeext conftest.$ac_ext
13848   LIBS=$ac_check_lib_save_LIBS
13849   fi
13850 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13851 < $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13852 < if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13850 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13851 > $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13852 > if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13853    cat >>confdefs.h <<_ACEOF
13854 < #define HAVE_LIBSSL 1
13854 > #define HAVE_LIBCRYPTO 1
13855   _ACEOF
13856  
13857 <  LIBS="-lssl $LIBS"
13857 >  LIBS="-lcrypto $LIBS"
13858  
13859   fi
13860  
13861 <    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
13862 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13863 < $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13864 < if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13861 >    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
13862 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13863 > $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13864 > if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13865    $as_echo_n "(cached) " >&6
13866   else
13867    ac_check_lib_save_LIBS=$LIBS
13868 < LIBS="-lcrypto  $LIBS"
13868 > LIBS="-lssl  $LIBS"
13869   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13870   /* end confdefs.h.  */
13871  
# Line 13833 | Line 13875 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13875   #ifdef __cplusplus
13876   extern "C"
13877   #endif
13878 < char RSA_free ();
13878 > char SSL_connect ();
13879   int
13880   main ()
13881   {
13882 < return RSA_free ();
13882 > return SSL_connect ();
13883    ;
13884    return 0;
13885   }
13886   _ACEOF
13887   if ac_fn_c_try_link "$LINENO"; then :
13888 <  ac_cv_lib_crypto_RSA_free=yes
13888 >  ac_cv_lib_ssl_SSL_connect=yes
13889   else
13890 <  ac_cv_lib_crypto_RSA_free=no
13890 >  ac_cv_lib_ssl_SSL_connect=no
13891   fi
13892   rm -f core conftest.err conftest.$ac_objext \
13893      conftest$ac_exeext conftest.$ac_ext
13894   LIBS=$ac_check_lib_save_LIBS
13895   fi
13896 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13897 < $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13898 < if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13896 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13897 > $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13898 > if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13899    cat >>confdefs.h <<_ACEOF
13900 < #define HAVE_LIBCRYPTO 1
13900 > #define HAVE_LIBSSL 1
13901   _ACEOF
13902  
13903 <  LIBS="-lcrypto $LIBS"
13903 >  LIBS="-lssl $LIBS"
13904  
13905   fi
13906  
# Line 13871 | Line 13913 | $as_echo "no - OpenSSL support disabled"
13913   fi
13914   fi
13915  
13916 < if test "$ac_cv_lib_crypto_RSA_free" = yes; then
13916 > if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
13917    ENABLE_SSL_TRUE=
13918    ENABLE_SSL_FALSE='#'
13919   else
# Line 13896 | Line 13938 | $as_echo "#define NDEBUG 1" >>confdefs.h
13938   fi
13939  
13940  
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
13941  
13942 + $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
13943  
13922 $as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
13944  
13945 + $as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h
13946  
13925 $as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
13947  
13948 + $as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h
13949  
13928 $as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
13950  
13951 + $as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h
13952  
13931 $as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h
13953  
13954 + $as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h
13955  
13934 $as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h
13956  
13957 + $as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h
13958  
13937 $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
13947
13948
13949 $as_echo "#define BAN_HEAP_SIZE 1024" >>confdefs.h
13950
13951
13952 $as_echo "#define CLIENT_HEAP_SIZE 1024" >>confdefs.h
13953
13954
13955 $as_echo "#define LCLIENT_HEAP_SIZE 512" >>confdefs.h
13959  
13960 + $as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h
13961  
13958 $as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h
13962  
13963 + $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
13964  
13961 $as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h
13965  
13966 + $as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h
13967  
13964 $as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h
13968  
13969 + $as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h
13970  
13967 $as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h
13971  
13972 <
13970 < $as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h
13971 <
13972 < fi
13972 > $as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h
13973  
13974  
13975   # Argument processing.
# Line 13990 | Line 13990 | if test "${enable_devpoll+set}" = set; t
13990    enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll"
13991   fi
13992  
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
13993    # Check whether --enable-poll was given.
13994   if test "${enable_poll+set}" = set; then :
13995    enableval=$enable_poll; desired_iopoll_mechanism="poll"
# Line 14178 | Line 14173 | rm -f core conftest.err conftest.$ac_obj
14173   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14174  
14175    fi
14176 <      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
14176 >      iopoll_mechanism_poll=4
14177  
14178   cat >>confdefs.h <<_ACEOF
14179   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14273 | Line 14227 | else
14227   fi
14228   rm -f core conftest.err conftest.$ac_objext \
14229      conftest$ac_exeext conftest.$ac_ext
14230 <      iopoll_mechanism_select=6
14230 >      iopoll_mechanism_select=5
14231  
14232   cat >>confdefs.h <<_ACEOF
14233   #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
# Line 14328 | Line 14282 | fi
14282   rm -f core conftest.err conftest.$ac_objext \
14283      conftest$ac_exeext conftest.$ac_ext
14284        optimal_iopoll_mechanism="none"
14285 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
14285 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14286      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14287      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14288        optimal_iopoll_mechanism="$mechanism"
# Line 14365 | Line 14319 | _ACEOF
14319  
14320  
14321  
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
14322    # Check whether --enable-halfops was given.
14323   if test "${enable_halfops+set}" = set; then :
14324    enableval=$enable_halfops; halfops="$enableval"
# Line 14417 | Line 14341 | else
14341   fi
14342  
14343    if test "$debugging" = "yes" ; then
14420
14421 $as_echo "#define DEBUG 1" >>confdefs.h
14422
14344      CFLAGS="-Wall -g -O0"
14424  else
14425
14426 $as_echo "#define NDEBUG 1" >>confdefs.h
14427
14345    fi
14346  
14347  
# Line 14526 | Line 14443 | _ACEOF
14443    test "$exec_prefix_NONE" && exec_prefix=NONE
14444  
14445  
14446 < 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"
14446 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile help/opers/Makefile help/users/Makefile tools/Makefile"
14447  
14448  
14449   cat >confcache <<\_ACEOF
# Line 15093 | Line 15010 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
15010   # report actual input values of CONFIG_FILES etc. instead of their
15011   # values after options handling.
15012   ac_log="
15013 < This file was extended by ircd-hybrid $as_me 8beta1, which was
15013 > This file was extended by ircd-hybrid $as_me TRUNK, which was
15014   generated by GNU Autoconf 2.69.  Invocation command line was
15015  
15016    CONFIG_FILES    = $CONFIG_FILES
# Line 15159 | Line 15076 | _ACEOF
15076   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15077   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15078   ac_cs_version="\\
15079 < ircd-hybrid config.status 8beta1
15079 > ircd-hybrid config.status TRUNK
15080   configured by $0, generated by GNU Autoconf 2.69,
15081    with options \\"\$ac_cs_config\\"
15082  
# Line 15569 | Line 15486 | do
15486      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
15487      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
15488      "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" ;;
15489      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
15490      "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
15576    "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;;
15491      "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
15492      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
15493      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
# Line 16177 | Line 16091 | $as_echo "$as_me: executing $ac_file com
16091  
16092    case $ac_file$ac_mode in
16093      "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
16094 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
16094 >  # Older Autoconf quotes --file arguments for eval, but not when files
16095    # are listed without --file.  Let's play safe and only enable the eval
16096    # if we detect the quoting.
16097    case $CONFIG_FILES in

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 1921 by michael, Tue Apr 30 14:54:20 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

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