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

Comparing:
ircd-hybrid-8/configure (file contents), Revision 1504 by michael, Thu Aug 16 18:03:00 2012 UTC vs.
ircd-hybrid/branches/8.1.x/configure (file contents), Revision 2489 by michael, Fri Oct 25 16:15:39 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 1494 2012-08-03 16:22:42Z michael .
2 > # From configure.ac Id: configure.ac 2488 2013-10-23 18:33:26Z michael .
3   # Guess values for system-dependent variables and create Makefiles.
4 < # Generated by GNU Autoconf 2.69 for ircd-hybrid 8beta3.
4 > # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.1.8.
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='8beta3'
597 < PACKAGE_STRING='ircd-hybrid 8beta3'
596 > PACKAGE_VERSION='8.1.8'
597 > PACKAGE_STRING='ircd-hybrid 8.1.8'
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
# Line 787 | 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 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
806 enable_small_net
811   enable_kqueue
812   enable_epoll
813   enable_devpoll
810 enable_rtsigio
814   enable_poll
815   enable_select
813 with_nicklen
814 with_topiclen
816   enable_halfops
817   enable_debugging
818   enable_warnings
# Line 1367 | 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 8beta3 to adapt to many kinds of systems.
1371 > \`configure' configures ircd-hybrid 8.1.8 to adapt to many kinds of systems.
1372  
1373   Usage: $0 [OPTION]... [VAR=VALUE]...
1374  
# Line 1437 | 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 8beta3:";;
1441 >     short | recursive ) echo "Configuration of ircd-hybrid 8.1.8:";;
1442     esac
1443    cat <<\_ACEOF
1444  
# Line 1445 | 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 1458 | 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
1465  --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.
1469  --enable-rtsigio        Force rtsigio usage.
1471    --enable-poll           Force poll usage.
1472    --enable-select         Force select usage.
1473    --enable-halfops        Enable halfops support.
# Line 1484 | 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
1487  --with-nicklen=<value>  Set nickname length (default 9).
1488  --with-topiclen=<value> Set topic length (default 160).
1488  
1489   Some influential environment variables:
1490    CC          C compiler command
# Line 1569 | 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 8beta3
1571 > ircd-hybrid configure 8.1.8
1572   generated by GNU Autoconf 2.69
1573  
1574   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 2095 | 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 8beta3, which was
2097 > It was created by ircd-hybrid $as_me 8.1.8, which was
2098   generated by GNU Autoconf 2.69.  Invocation command line was
2099  
2100    $ $0 $@
# Line 2375 | Line 2374 | $as_echo "$as_me: creating cache $cache_
2374    >$cache_file
2375   fi
2376  
2378 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 2455 | 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.14'
2457  
2458   ac_aux_dir=
2459   for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
# Line 2668 | 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 2909 | 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 2931 | Line 2968 | fi
2968  
2969   # Define the identity of the package.
2970   PACKAGE='ircd-hybrid'
2971 < VERSION='8beta3'
2971 > VERSION='8.1.8'
2972  
2973  
2974   cat >>confdefs.h <<_ACEOF
# Line 2971 | Line 3008 | mkdir_p='$(MKDIR_P)'
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 2978 | Line 3019 | am__tar='$${TAR-tar} chof - "$$tardir"'
3019  
3020  
3021  
3022 + # POSIX will say in a future version that running "rm -f" with no argument
3023 + # is OK; and we want to be able to make that assumption in our Makefile
3024 + # recipes.  So use an aggressive probe to check that the usage we want is
3025 + # actually supported "in the wild" to an acceptable degree.
3026 + # See automake bug#10828.
3027 + # To make any issue more visible, cause the running configure to be aborted
3028 + # by default if the 'rm' program in use doesn't match our expectations; the
3029 + # user can still override this though.
3030 + if rm -f && rm -fr && rm -rf; then : OK; else
3031 +  cat >&2 <<'END'
3032 + Oops!
3033 +
3034 + Your 'rm' program seems unable to run without file operands specified
3035 + on the command line, even when the '-f' option is present.  This is contrary
3036 + to the behaviour of most rm programs out there, and not conforming with
3037 + the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3038 +
3039 + Please tell bug-automake@gnu.org about your system, including the value
3040 + of your $PATH and any error possibly output before this message.  This
3041 + can help us improve future automake versions.
3042 +
3043 + END
3044 +  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3045 +    echo 'Configuration will proceed anyway, since you have set the' >&2
3046 +    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3047 +    echo >&2
3048 +  else
3049 +    cat >&2 <<'END'
3050 + Aborting the configuration process, to ensure you take notice of the issue.
3051 +
3052 + You can download and install GNU coreutils to get an 'rm' implementation
3053 + that behaves properly: <http://www.gnu.org/software/coreutils/>.
3054 +
3055 + If you want to complete the configuration process using your problematic
3056 + 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3057 + to "yes", and re-run configure.
3058 +
3059 + END
3060 +    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3061 +  fi
3062 + fi
3063 +
3064   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3065   $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3066      # Check whether --enable-maintainer-mode was given.
# Line 3000 | Line 3083 | fi
3083    MAINT=$MAINTAINER_MODE_TRUE
3084  
3085  
3086 +
3087   ac_config_headers="$ac_config_headers config.h"
3088  
3089  
# Line 3857 | Line 3941 | ac_compile='$CC -c $CFLAGS $CPPFLAGS con
3941   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3942   ac_compiler_gnu=$ac_cv_c_compiler_gnu
3943  
3944 + ac_ext=c
3945 + ac_cpp='$CPP $CPPFLAGS'
3946 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3947 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3948 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
3949 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
3950 + $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
3951 + if ${am_cv_prog_cc_c_o+:} false; then :
3952 +  $as_echo_n "(cached) " >&6
3953 + else
3954 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3955 + /* end confdefs.h.  */
3956 +
3957 + int
3958 + main ()
3959 + {
3960 +
3961 +  ;
3962 +  return 0;
3963 + }
3964 + _ACEOF
3965 +  # Make sure it works both with $CC and with simple cc.
3966 +  # Following AC_PROG_CC_C_O, we do the test twice because some
3967 +  # compilers refuse to overwrite an existing .o file with -o,
3968 +  # though they will create one.
3969 +  am_cv_prog_cc_c_o=yes
3970 +  for am_i in 1 2; do
3971 +    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
3972 +   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
3973 +   ac_status=$?
3974 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3975 +   (exit $ac_status); } \
3976 +         && test -f conftest2.$ac_objext; then
3977 +      : OK
3978 +    else
3979 +      am_cv_prog_cc_c_o=no
3980 +      break
3981 +    fi
3982 +  done
3983 +  rm -f core conftest*
3984 +  unset am_i
3985 + fi
3986 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
3987 + $as_echo "$am_cv_prog_cc_c_o" >&6; }
3988 + if test "$am_cv_prog_cc_c_o" != yes; then
3989 +   # Losing compiler, so override with the script.
3990 +   # FIXME: It is wrong to rewrite CC.
3991 +   # But if we don't then we get into trouble of one sort or another.
3992 +   # A longer-term fix would be to have automake use am__CC in this case,
3993 +   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3994 +   CC="$am_aux_dir/compile $CC"
3995 + fi
3996 + ac_ext=c
3997 + ac_cpp='$CPP $CPPFLAGS'
3998 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3999 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4000 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
4001 +
4002 +
4003   depcc="$CC"   am_compiler_list=
4004  
4005   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
# Line 8417 | Line 8560 | _lt_linker_boilerplate=`cat conftest.err
8560   $RM -r conftest*
8561  
8562  
8563 + ## CAVEAT EMPTOR:
8564 + ## There is no encapsulation within the following macros, do not change
8565 + ## the running order or otherwise move them around unless you know exactly
8566 + ## what you are doing...
8567   if test -n "$compiler"; then
8568  
8569   lt_prog_compiler_no_builtin_flag=
# Line 13030 | Line 13177 | LIBTOOL="$LIBTOOL --silent"
13177  
13178   # Checks for libraries.
13179  
13180 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13181 < $as_echo_n "checking for library containing socket... " >&6; }
13182 < if ${ac_cv_search_socket+:} false; then :
13180 >
13181 >  if test "X$CC" != "X"; then
13182 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} accepts -fstack-protector" >&5
13183 > $as_echo_n "checking whether ${CC} accepts -fstack-protector... " >&6; }
13184 > if ${ssp_cv_cc+:} false; then :
13185 >  $as_echo_n "(cached) " >&6
13186 > else
13187 >  ssp_old_cflags="$CFLAGS"
13188 >       CFLAGS="$CFLAGS -fstack-protector"
13189 >       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13190 > /* end confdefs.h.  */
13191 >
13192 > int
13193 > main ()
13194 > {
13195 >
13196 >  ;
13197 >  return 0;
13198 > }
13199 > _ACEOF
13200 > if ac_fn_c_try_compile "$LINENO"; then :
13201 >  ssp_cv_cc=yes
13202 > else
13203 >  ssp_cv_cc=no
13204 > fi
13205 > rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13206 >       CFLAGS="$ssp_old_cflags"
13207 >
13208 > fi
13209 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssp_cv_cc" >&5
13210 > $as_echo "$ssp_cv_cc" >&6; }
13211 >    if test $ssp_cv_cc = yes; then
13212 >      CFLAGS="$CFLAGS -fstack-protector"
13213 >
13214 > $as_echo "#define ENABLE_SSP_CC 1" >>confdefs.h
13215 >
13216 >    fi
13217 >  fi
13218 >
13219 >
13220 >
13221 >  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13222 > if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13223 >
13224 > else
13225 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
13226 > $as_echo_n "checking for library containing getaddrinfo... " >&6; }
13227 > if ${ac_cv_search_getaddrinfo+:} false; then :
13228    $as_echo_n "(cached) " >&6
13229   else
13230    ac_func_search_save_LIBS=$LIBS
# Line 13045 | Line 13237 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13237   #ifdef __cplusplus
13238   extern "C"
13239   #endif
13240 < char socket ();
13240 > char getaddrinfo ();
13241   int
13242   main ()
13243   {
13244 < return socket ();
13244 > return getaddrinfo ();
13245    ;
13246    return 0;
13247   }
13248   _ACEOF
13249 < for ac_lib in '' socket; do
13249 > for ac_lib in '' nsl; do
13250    if test -z "$ac_lib"; then
13251      ac_res="none required"
13252    else
# Line 13062 | Line 13254 | for ac_lib in '' socket; do
13254      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13255    fi
13256    if ac_fn_c_try_link "$LINENO"; then :
13257 <  ac_cv_search_socket=$ac_res
13257 >  ac_cv_search_getaddrinfo=$ac_res
13258   fi
13259   rm -f core conftest.err conftest.$ac_objext \
13260      conftest$ac_exeext
13261 <  if ${ac_cv_search_socket+:} false; then :
13261 >  if ${ac_cv_search_getaddrinfo+:} false; then :
13262    break
13263   fi
13264   done
13265 < if ${ac_cv_search_socket+:} false; then :
13265 > if ${ac_cv_search_getaddrinfo+:} false; then :
13266  
13267   else
13268 <  ac_cv_search_socket=no
13268 >  ac_cv_search_getaddrinfo=no
13269   fi
13270   rm conftest.$ac_ext
13271   LIBS=$ac_func_search_save_LIBS
13272   fi
13273 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13274 < $as_echo "$ac_cv_search_socket" >&6; }
13275 < ac_res=$ac_cv_search_socket
13273 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
13274 > $as_echo "$ac_cv_search_getaddrinfo" >&6; }
13275 > ac_res=$ac_cv_search_getaddrinfo
13276   if test "$ac_res" != no; then :
13277    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13278  
13087 else
13088  as_fn_error $? "socket library not found" "$LINENO" 5
13279   fi
13280  
13281 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
13282 < $as_echo_n "checking for library containing inet_ntoa... " >&6; }
13283 < if ${ac_cv_search_inet_ntoa+:} false; then :
13281 > fi
13282 >
13283 >  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
13284 > if test "x$ac_cv_func_getnameinfo" = xyes; then :
13285 >
13286 > else
13287 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
13288 > $as_echo_n "checking for library containing getnameinfo... " >&6; }
13289 > if ${ac_cv_search_getnameinfo+:} false; then :
13290    $as_echo_n "(cached) " >&6
13291   else
13292    ac_func_search_save_LIBS=$LIBS
# Line 13103 | Line 13299 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13299   #ifdef __cplusplus
13300   extern "C"
13301   #endif
13302 < char inet_ntoa ();
13302 > char getnameinfo ();
13303   int
13304   main ()
13305   {
13306 < return inet_ntoa ();
13306 > return getnameinfo ();
13307    ;
13308    return 0;
13309   }
# Line 13120 | Line 13316 | for ac_lib in '' nsl; do
13316      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13317    fi
13318    if ac_fn_c_try_link "$LINENO"; then :
13319 <  ac_cv_search_inet_ntoa=$ac_res
13319 >  ac_cv_search_getnameinfo=$ac_res
13320   fi
13321   rm -f core conftest.err conftest.$ac_objext \
13322      conftest$ac_exeext
13323 <  if ${ac_cv_search_inet_ntoa+:} false; then :
13323 >  if ${ac_cv_search_getnameinfo+:} false; then :
13324    break
13325   fi
13326   done
13327 < if ${ac_cv_search_inet_ntoa+:} false; then :
13327 > if ${ac_cv_search_getnameinfo+:} false; then :
13328  
13329   else
13330 <  ac_cv_search_inet_ntoa=no
13330 >  ac_cv_search_getnameinfo=no
13331   fi
13332   rm conftest.$ac_ext
13333   LIBS=$ac_func_search_save_LIBS
13334   fi
13335 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5
13336 < $as_echo "$ac_cv_search_inet_ntoa" >&6; }
13337 < ac_res=$ac_cv_search_inet_ntoa
13335 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5
13336 > $as_echo "$ac_cv_search_getnameinfo" >&6; }
13337 > ac_res=$ac_cv_search_getnameinfo
13338   if test "$ac_res" != no; then :
13339    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13340  
13341   fi
13342  
13343 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
13344 < $as_echo_n "checking for library containing inet_aton... " >&6; }
13345 < if ${ac_cv_search_inet_aton+:} false; then :
13343 > fi
13344 >
13345 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13346 > $as_echo_n "checking for library containing socket... " >&6; }
13347 > if ${ac_cv_search_socket+:} false; then :
13348    $as_echo_n "(cached) " >&6
13349   else
13350    ac_func_search_save_LIBS=$LIBS
# Line 13159 | Line 13357 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13357   #ifdef __cplusplus
13358   extern "C"
13359   #endif
13360 < char inet_aton ();
13360 > char socket ();
13361   int
13362   main ()
13363   {
13364 < return inet_aton ();
13364 > return socket ();
13365    ;
13366    return 0;
13367   }
13368   _ACEOF
13369 < for ac_lib in '' resolv; do
13369 > for ac_lib in '' socket; do
13370    if test -z "$ac_lib"; then
13371      ac_res="none required"
13372    else
# Line 13176 | Line 13374 | for ac_lib in '' resolv; do
13374      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13375    fi
13376    if ac_fn_c_try_link "$LINENO"; then :
13377 <  ac_cv_search_inet_aton=$ac_res
13377 >  ac_cv_search_socket=$ac_res
13378   fi
13379   rm -f core conftest.err conftest.$ac_objext \
13380      conftest$ac_exeext
13381 <  if ${ac_cv_search_inet_aton+:} false; then :
13381 >  if ${ac_cv_search_socket+:} false; then :
13382    break
13383   fi
13384   done
13385 < if ${ac_cv_search_inet_aton+:} false; then :
13385 > if ${ac_cv_search_socket+:} false; then :
13386  
13387   else
13388 <  ac_cv_search_inet_aton=no
13388 >  ac_cv_search_socket=no
13389   fi
13390   rm conftest.$ac_ext
13391   LIBS=$ac_func_search_save_LIBS
13392   fi
13393 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
13394 < $as_echo "$ac_cv_search_inet_aton" >&6; }
13395 < ac_res=$ac_cv_search_inet_aton
13393 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13394 > $as_echo "$ac_cv_search_socket" >&6; }
13395 > ac_res=$ac_cv_search_socket
13396   if test "$ac_res" != no; then :
13397    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13398  
13399 + else
13400 +  as_fn_error $? "socket library not found" "$LINENO" 5
13401   fi
13402  
13203  for ac_func in inet_aton inet_ntop inet_pton
13204 do :
13205  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13206 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13207 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
13208  cat >>confdefs.h <<_ACEOF
13209 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13210 _ACEOF
13211
13212 fi
13213 done
13214
13403    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13404     #include <sys/socket.h>
13405     #include <netdb.h>
# Line 13528 | Line 13716 | done
13716  
13717  
13718  
13531
13532
13719   # Checks for header files.
13720  
13721  
# Line 13621 | Line 13807 | if test "$ac_res" != no; then :
13807   fi
13808  
13809  
13810 < # Check whether --enable-libpcre was given.
13811 < if test "${enable_libpcre+set}" = set; then :
13812 <  enableval=$enable_libpcre;
13813 < else
13814 <  ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
13815 < if test "x$ac_cv_header_pcre_h" = xyes; then :
13816 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pcre_study" >&5
13817 < $as_echo_n "checking for library containing pcre_study... " >&6; }
13818 < if ${ac_cv_search_pcre_study+:} false; then :
13810 > # Check whether --enable-libgeoip was given.
13811 > if test "${enable_libgeoip+set}" = set; then :
13812 >  enableval=$enable_libgeoip;
13813 > else
13814 >  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13815 > if test "x$ac_cv_header_GeoIP_h" = xyes; then :
13816 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
13817 > $as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
13818 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13819    $as_echo_n "(cached) " >&6
13820   else
13821    ac_func_search_save_LIBS=$LIBS
# Line 13642 | Line 13828 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13828   #ifdef __cplusplus
13829   extern "C"
13830   #endif
13831 < char pcre_study ();
13831 > char GeoIP_id_by_ipnum_v6_gl ();
13832   int
13833   main ()
13834   {
13835 < return pcre_study ();
13835 > return GeoIP_id_by_ipnum_v6_gl ();
13836    ;
13837    return 0;
13838   }
13839   _ACEOF
13840 < for ac_lib in '' pcre; do
13840 > for ac_lib in '' GeoIP; do
13841    if test -z "$ac_lib"; then
13842      ac_res="none required"
13843    else
# Line 13659 | Line 13845 | for ac_lib in '' pcre; do
13845      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13846    fi
13847    if ac_fn_c_try_link "$LINENO"; then :
13848 <  ac_cv_search_pcre_study=$ac_res
13848 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
13849   fi
13850   rm -f core conftest.err conftest.$ac_objext \
13851      conftest$ac_exeext
13852 <  if ${ac_cv_search_pcre_study+:} false; then :
13852 >  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13853    break
13854   fi
13855   done
13856 < if ${ac_cv_search_pcre_study+:} false; then :
13856 > if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13857  
13858   else
13859 <  ac_cv_search_pcre_study=no
13859 >  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
13860   fi
13861   rm conftest.$ac_ext
13862   LIBS=$ac_func_search_save_LIBS
13863   fi
13864 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pcre_study" >&5
13865 < $as_echo "$ac_cv_search_pcre_study" >&6; }
13866 < ac_res=$ac_cv_search_pcre_study
13864 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
13865 > $as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
13866 > ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
13867   if test "$ac_res" != no; then :
13868    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13869  
13870 < $as_echo "#define HAVE_LIBPCRE 1" >>confdefs.h
13870 > $as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
13871  
13872   fi
13873  
# Line 13691 | Line 13877 | fi
13877   fi
13878  
13879  
13880 +
13881   # Check whether --enable-openssl was given.
13882   if test "${enable_openssl+set}" = set; then :
13883    enableval=$enable_openssl;  cf_enable_openssl=$enableval
# Line 13903 | Line 14090 | $as_echo "#define NDEBUG 1" >>confdefs.h
14090   fi
14091  
14092  
14093 < # Check whether --enable-small-net was given.
13907 < if test "${enable_small_net+set}" = set; then :
13908 <  enableval=$enable_small_net; small_net=$enableval
13909 < else
13910 <  small_net=no
13911 < fi
13912 <
13913 <
13914 < if test "$small_net" = "yes"; then :
13915 <
13916 <
13917 < $as_echo "#define NICKNAMEHISTORYLENGTH 2048" >>confdefs.h
13918 <
13919 <
13920 < $as_echo "#define CHANNEL_HEAP_SIZE 256" >>confdefs.h
14093 > $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
14094  
14095  
14096 < $as_echo "#define BAN_HEAP_SIZE 128" >>confdefs.h
14096 > $as_echo "#define MP_CHUNK_SIZE_CHANNEL 1024*1024" >>confdefs.h
14097  
14098  
14099 < $as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h
14099 > $as_echo "#define MP_CHUNK_SIZE_MEMBER 2048*1024" >>confdefs.h
14100  
14101  
14102 < $as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
14102 > $as_echo "#define MP_CHUNK_SIZE_BAN 1024*1024" >>confdefs.h
14103  
14104  
14105 < $as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
14105 > $as_echo "#define MP_CHUNK_SIZE_CLIENT 1024*1024" >>confdefs.h
14106  
14107  
14108 < $as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
14108 > $as_echo "#define MP_CHUNK_SIZE_LCLIENT 512*1024" >>confdefs.h
14109  
14110  
14111 < $as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h
13939 <
13940 <
13941 < $as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h
13942 <
13943 <
13944 < $as_echo "#define DNS_HEAP_SIZE 128" >>confdefs.h
13945 <
13946 < else
13947 <
14111 > $as_echo "#define MP_CHUNK_SIZE_DNODE 32*1024" >>confdefs.h
14112  
14113  
14114 < $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h
14114 > $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
14115  
14116  
14117 < $as_echo "#define CHANNEL_HEAP_SIZE 1024" >>confdefs.h
14117 > $as_echo "#define MP_CHUNK_SIZE_AUTH 128*1024" >>confdefs.h
14118  
14119  
14120 < $as_echo "#define BAN_HEAP_SIZE 1024" >>confdefs.h
14120 > $as_echo "#define MP_CHUNK_SIZE_DNS 64*1024" >>confdefs.h
14121  
14122  
14123 < $as_echo "#define CLIENT_HEAP_SIZE 1024" >>confdefs.h
14123 > $as_echo "#define MP_CHUNK_SIZE_WATCH 8*1024" >>confdefs.h
14124  
14125  
14126 < $as_echo "#define LCLIENT_HEAP_SIZE 512" >>confdefs.h
14126 > $as_echo "#define MP_CHUNK_SIZE_NAMEHOST 64*1024" >>confdefs.h
14127  
14128  
14129 < $as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h
14129 > $as_echo "#define MP_CHUNK_SIZE_USERHOST 128*1024" >>confdefs.h
14130  
14131  
14132 < $as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h
13969 <
13970 <
13971 < $as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h
13972 <
13973 <
13974 < $as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h
13975 <
13976 <
13977 < $as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h
13978 <
13979 < fi
14132 > $as_echo "#define MP_CHUNK_SIZE_IP_ENTRY 128*1024" >>confdefs.h
14133  
14134  
14135   # Argument processing.
# Line 13997 | Line 14150 | if test "${enable_devpoll+set}" = set; t
14150    enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll"
14151   fi
14152  
14000  # Check whether --enable-rtsigio was given.
14001 if test "${enable_rtsigio+set}" = set; then :
14002  enableval=$enable_rtsigio; desired_iopoll_mechanism="rtsigio"
14003 fi
14004
14153    # Check whether --enable-poll was given.
14154   if test "${enable_poll+set}" = set; then :
14155    enableval=$enable_poll; desired_iopoll_mechanism="poll"
# Line 14185 | Line 14333 | rm -f core conftest.err conftest.$ac_obj
14333   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14334  
14335    fi
14336 <      iopoll_mechanism_rtsigio=4
14189 <
14190 < cat >>confdefs.h <<_ACEOF
14191 < #define __IOPOLL_MECHANISM_RTSIGIO $iopoll_mechanism_rtsigio
14192 < _ACEOF
14193 <
14194 <  if test "$cross_compiling" = yes; then :
14195 <  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14196 < $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14197 < as_fn_error $? "cannot run test program while cross compiling
14198 < See \`config.log' for more details" "$LINENO" 5; }
14199 < else
14200 <  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14201 < /* end confdefs.h.  */
14202 <
14203 < #define _GNU_SOURCE
14204 < #include <fcntl.h>
14205 < static unsigned int have_f_setsig = 0;
14206 <
14207 < int
14208 < main ()
14209 < {
14210 <
14211 < #ifdef F_SETSIG
14212 <  have_f_setsig = 1;
14213 < #endif
14214 <  return have_f_setsig == 0;
14215 <
14216 <  ;
14217 <  return 0;
14218 < }
14219 < _ACEOF
14220 < if ac_fn_c_try_run "$LINENO"; then :
14221 <  is_rtsigio_mechanism_available="yes"
14222 < else
14223 <  is_rtsigio_mechanism_available="no"
14224 < fi
14225 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14226 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
14227 < fi
14228 <
14229 <      iopoll_mechanism_poll=5
14336 >      iopoll_mechanism_poll=4
14337  
14338   cat >>confdefs.h <<_ACEOF
14339   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14280 | Line 14387 | else
14387   fi
14388   rm -f core conftest.err conftest.$ac_objext \
14389      conftest$ac_exeext conftest.$ac_ext
14390 <      iopoll_mechanism_select=6
14390 >      iopoll_mechanism_select=5
14391  
14392   cat >>confdefs.h <<_ACEOF
14393   #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
# Line 14335 | Line 14442 | fi
14442   rm -f core conftest.err conftest.$ac_objext \
14443      conftest$ac_exeext conftest.$ac_ext
14444        optimal_iopoll_mechanism="none"
14445 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
14445 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14446      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14447      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14448        optimal_iopoll_mechanism="$mechanism"
# Line 14372 | Line 14479 | _ACEOF
14479  
14480  
14481  
14375
14376 # Check whether --with-nicklen was given.
14377 if test "${with_nicklen+set}" = set; then :
14378  withval=$with_nicklen; nicklen="$withval"
14379 else
14380  nicklen="9"
14381 fi
14382
14383
14384 cat >>confdefs.h <<_ACEOF
14385 #define NICKLEN ($nicklen)
14386 _ACEOF
14387
14388
14389
14390
14391 # Check whether --with-topiclen was given.
14392 if test "${with_topiclen+set}" = set; then :
14393  withval=$with_topiclen; topiclen="$withval"
14394 else
14395  topiclen="160"
14396 fi
14397
14398
14399 cat >>confdefs.h <<_ACEOF
14400 #define TOPICLEN ($topiclen)
14401 _ACEOF
14402
14403
14404
14482    # Check whether --enable-halfops was given.
14483   if test "${enable_halfops+set}" = set; then :
14484    enableval=$enable_halfops; halfops="$enableval"
# Line 14424 | Line 14501 | else
14501   fi
14502  
14503    if test "$debugging" = "yes" ; then
14427
14428 $as_echo "#define DEBUG 1" >>confdefs.h
14429
14504      CFLAGS="-Wall -g -O0"
14431  else
14432
14433 $as_echo "#define NDEBUG 1" >>confdefs.h
14434
14505    fi
14506  
14507  
# Line 14533 | Line 14603 | _ACEOF
14603    test "$exec_prefix_NONE" && exec_prefix=NONE
14604  
14605  
14606 < 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"
14606 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile tools/Makefile"
14607  
14608  
14609   cat >confcache <<\_ACEOF
# Line 15100 | Line 15170 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
15170   # report actual input values of CONFIG_FILES etc. instead of their
15171   # values after options handling.
15172   ac_log="
15173 < This file was extended by ircd-hybrid $as_me 8beta3, which was
15173 > This file was extended by ircd-hybrid $as_me 8.1.8, which was
15174   generated by GNU Autoconf 2.69.  Invocation command line was
15175  
15176    CONFIG_FILES    = $CONFIG_FILES
# Line 15166 | Line 15236 | _ACEOF
15236   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15237   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15238   ac_cs_version="\\
15239 < ircd-hybrid config.status 8beta3
15239 > ircd-hybrid config.status 8.1.8
15240   configured by $0, generated by GNU Autoconf 2.69,
15241    with options \\"\$ac_cs_config\\"
15242  
# Line 15576 | Line 15646 | do
15646      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
15647      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
15648      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
15579    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
15580    "contrib/help/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/help/Makefile" ;;
15649      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
15650      "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
15583    "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;;
15651      "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
15652      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
15653      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
15654      "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
15588    "help/opers/Makefile") CONFIG_FILES="$CONFIG_FILES help/opers/Makefile" ;;
15589    "help/users/Makefile") CONFIG_FILES="$CONFIG_FILES help/users/Makefile" ;;
15655      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
15656  
15657    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
# Line 16184 | Line 16249 | $as_echo "$as_me: executing $ac_file com
16249  
16250    case $ac_file$ac_mode in
16251      "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
16252 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
16252 >  # Older Autoconf quotes --file arguments for eval, but not when files
16253    # are listed without --file.  Let's play safe and only enable the eval
16254    # if we detect the quoting.
16255    case $CONFIG_FILES in
# Line 16235 | Line 16300 | $as_echo X"$mf" |
16300      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
16301      test -z "$DEPDIR" && continue
16302      am__include=`sed -n 's/^am__include = //p' < "$mf"`
16303 <    test -z "am__include" && continue
16303 >    test -z "$am__include" && continue
16304      am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
16305      # Find all dependency output files, they are included files with
16306      # $(DEPDIR) in their names.  We invoke sed twice because it is the

Comparing:
ircd-hybrid-8/configure (property svn:eol-style), Revision 1504 by michael, Thu Aug 16 18:03:00 2012 UTC vs.
ircd-hybrid/branches/8.1.x/configure (property svn:eol-style), Revision 2489 by michael, Fri Oct 25 16:15:39 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

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