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 1908 by michael, Sat Apr 27 21:25:11 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 1856 2013-04-24 19:43:22Z 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 800 | Line 806 | with_ltdl_include
806   with_ltdl_lib
807   enable_ltdl_install
808   enable_libpcre
809 + enable_libGeoIP
810   enable_openssl
811   enable_assert
805 enable_small_net
812   enable_kqueue
813   enable_epoll
814   enable_devpoll
809 enable_rtsigio
815   enable_poll
816   enable_select
812 with_nicklen
813 with_topiclen
817   enable_halfops
818   enable_debugging
819   enable_warnings
# Line 1366 | Line 1369 | if test "$ac_init_help" = "long"; then
1369    # Omit some internal or obsolete options to make the list less imposing.
1370    # This message is too long to be a string in the A/UX 3.1 sh.
1371    cat <<_ACEOF
1372 < \`configure' configures ircd-hybrid 8beta1 to adapt to many kinds of systems.
1372 > \`configure' configures ircd-hybrid TRUNK to adapt to many kinds of systems.
1373  
1374   Usage: $0 [OPTION]... [VAR=VALUE]...
1375  
# Line 1436 | Line 1439 | fi
1439  
1440   if test -n "$ac_init_help"; then
1441    case $ac_init_help in
1442 <     short | recursive ) echo "Configuration of ircd-hybrid 8beta1:";;
1442 >     short | recursive ) echo "Configuration of ircd-hybrid TRUNK:";;
1443     esac
1444    cat <<\_ACEOF
1445  
# Line 1444 | Line 1447 | Optional Features:
1447    --disable-option-checking  ignore unrecognized --enable/--with options
1448    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1449    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1450 +  --enable-silent-rules   less verbose build output (undo: "make V=1")
1451 +  --disable-silent-rules  verbose build output (undo: "make V=0")
1452    --enable-maintainer-mode
1453                            enable make rules and dependencies not useful (and
1454                            sometimes confusing) to the casual installer
# Line 1458 | Line 1463 | Optional Features:
1463    --disable-libtool-lock  avoid locking (might break parallel builds)
1464    --enable-ltdl-install   install libltdl
1465    --disable-libpcre       Disable PCRE support
1466 +  --disable-libgeoip      Disable GeoIP support
1467    --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
1468    --disable-openssl            Disable OpenSSL support.
1469    --enable-assert         Enable assert() statements
1464  --enable-small-net      Enable small network support.
1470    --enable-kqueue         Force kqueue usage.
1471    --enable-epoll          Force epoll usage.
1472    --enable-devpoll        Force devpoll usage.
1468  --enable-rtsigio        Force rtsigio usage.
1473    --enable-poll           Force poll usage.
1474    --enable-select         Force select usage.
1475    --enable-halfops        Enable halfops support.
# Line 1483 | Line 1487 | Optional Packages:
1487    --with-included-ltdl    use the GNU ltdl sources included here
1488    --with-ltdl-include=DIR use the ltdl headers installed in DIR
1489    --with-ltdl-lib=DIR     use the libltdl.la installed in DIR
1486  --with-nicklen=<value>  Set nickname length (default 9).
1487  --with-topiclen=<value> Set topic length (default 160).
1490  
1491   Some influential environment variables:
1492    CC          C compiler command
# Line 1568 | Line 1570 | fi
1570   test -n "$ac_init_help" && exit $ac_status
1571   if $ac_init_version; then
1572    cat <<\_ACEOF
1573 < ircd-hybrid configure 8beta1
1573 > ircd-hybrid configure TRUNK
1574   generated by GNU Autoconf 2.69
1575  
1576   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 2094 | Line 2096 | cat >config.log <<_ACEOF
2096   This file contains any messages produced by compilers while
2097   running configure, to aid debugging if configure makes a mistake.
2098  
2099 < It was created by ircd-hybrid $as_me 8beta1, which was
2099 > It was created by ircd-hybrid $as_me TRUNK, which was
2100   generated by GNU Autoconf 2.69.  Invocation command line was
2101  
2102    $ $0 $@
# Line 2374 | Line 2376 | $as_echo "$as_me: creating cache $cache_
2376    >$cache_file
2377   fi
2378  
2377 as_fn_append ac_func_list " mmap"
2379   as_fn_append ac_func_list " strtok_r"
2380   as_fn_append ac_func_list " usleep"
2381   as_fn_append ac_func_list " strlcat"
# Line 2454 | Line 2455 | ac_link='$CC -o conftest$ac_exeext $CFLA
2455   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2456  
2457  
2458 < am__api_version='1.12'
2458 > am__api_version='1.13'
2459  
2460   ac_aux_dir=
2461   for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
# Line 2667 | Line 2668 | if test x"${MISSING+set}" != xset; then
2668    esac
2669   fi
2670   # Use eval to expand $SHELL
2671 < if eval "$MISSING --run true"; then
2672 <  am_missing_run="$MISSING --run "
2671 > if eval "$MISSING --is-lightweight"; then
2672 >  am_missing_run="$MISSING "
2673   else
2674    am_missing_run=
2675    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
# Line 2908 | Line 2909 | else
2909   fi
2910   rmdir .tst 2>/dev/null
2911  
2912 + # Check whether --enable-silent-rules was given.
2913 + if test "${enable_silent_rules+set}" = set; then :
2914 +  enableval=$enable_silent_rules;
2915 + fi
2916 +
2917 + case $enable_silent_rules in # (((
2918 +  yes) AM_DEFAULT_VERBOSITY=0;;
2919 +   no) AM_DEFAULT_VERBOSITY=1;;
2920 +    *) AM_DEFAULT_VERBOSITY=1;;
2921 + esac
2922 + am_make=${MAKE-make}
2923 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2924 + $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2925 + if ${am_cv_make_support_nested_variables+:} false; then :
2926 +  $as_echo_n "(cached) " >&6
2927 + else
2928 +  if $as_echo 'TRUE=$(BAR$(V))
2929 + BAR0=false
2930 + BAR1=true
2931 + V=1
2932 + am__doit:
2933 +        @$(TRUE)
2934 + .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2935 +  am_cv_make_support_nested_variables=yes
2936 + else
2937 +  am_cv_make_support_nested_variables=no
2938 + fi
2939 + fi
2940 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2941 + $as_echo "$am_cv_make_support_nested_variables" >&6; }
2942 + if test $am_cv_make_support_nested_variables = yes; then
2943 +    AM_V='$(V)'
2944 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2945 + else
2946 +  AM_V=$AM_DEFAULT_VERBOSITY
2947 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2948 + fi
2949 + AM_BACKSLASH='\'
2950 +
2951   if test "`cd $srcdir && pwd`" != "`pwd`"; then
2952    # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2953    # is not polluted with repeated "-I."
# Line 2930 | Line 2970 | fi
2970  
2971   # Define the identity of the package.
2972   PACKAGE='ircd-hybrid'
2973 < VERSION='8beta1'
2973 > VERSION='TRUNK'
2974  
2975  
2976   cat >>confdefs.h <<_ACEOF
# Line 2958 | Line 2998 | AUTOHEADER=${AUTOHEADER-"${am_missing_ru
2998  
2999   MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3000  
3001 + # For better backward compatibility.  To be removed once Automake 1.9.x
3002 + # dies out for good.  For more background, see:
3003 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3004 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3005 + mkdir_p='$(MKDIR_P)'
3006 +
3007   # We need awk for the "check" target.  The system "awk" is bad on
3008   # some platforms.
3009   # Always define AMTAR for backward compatibility.  Yes, it's still used
# Line 13023 | Line 13069 | LIBTOOL="$LIBTOOL --silent"
13069  
13070   # Checks for libraries.
13071  
13072 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13073 < $as_echo_n "checking for library containing socket... " >&6; }
13074 < if ${ac_cv_search_socket+:} false; then :
13072 >  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13073 > if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13074 >
13075 > else
13076 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
13077 > $as_echo_n "checking for library containing getaddrinfo... " >&6; }
13078 > if ${ac_cv_search_getaddrinfo+:} false; then :
13079    $as_echo_n "(cached) " >&6
13080   else
13081    ac_func_search_save_LIBS=$LIBS
# Line 13038 | Line 13088 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13088   #ifdef __cplusplus
13089   extern "C"
13090   #endif
13091 < char socket ();
13091 > char getaddrinfo ();
13092   int
13093   main ()
13094   {
13095 < return socket ();
13095 > return getaddrinfo ();
13096    ;
13097    return 0;
13098   }
13099   _ACEOF
13100 < for ac_lib in '' socket; do
13100 > for ac_lib in '' nsl; do
13101    if test -z "$ac_lib"; then
13102      ac_res="none required"
13103    else
# Line 13055 | Line 13105 | for ac_lib in '' socket; do
13105      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13106    fi
13107    if ac_fn_c_try_link "$LINENO"; then :
13108 <  ac_cv_search_socket=$ac_res
13108 >  ac_cv_search_getaddrinfo=$ac_res
13109   fi
13110   rm -f core conftest.err conftest.$ac_objext \
13111      conftest$ac_exeext
13112 <  if ${ac_cv_search_socket+:} false; then :
13112 >  if ${ac_cv_search_getaddrinfo+:} false; then :
13113    break
13114   fi
13115   done
13116 < if ${ac_cv_search_socket+:} false; then :
13116 > if ${ac_cv_search_getaddrinfo+:} false; then :
13117  
13118   else
13119 <  ac_cv_search_socket=no
13119 >  ac_cv_search_getaddrinfo=no
13120   fi
13121   rm conftest.$ac_ext
13122   LIBS=$ac_func_search_save_LIBS
13123   fi
13124 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13125 < $as_echo "$ac_cv_search_socket" >&6; }
13126 < ac_res=$ac_cv_search_socket
13124 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
13125 > $as_echo "$ac_cv_search_getaddrinfo" >&6; }
13126 > ac_res=$ac_cv_search_getaddrinfo
13127   if test "$ac_res" != no; then :
13128    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13129  
13080 else
13081  as_fn_error $? "socket library not found" "$LINENO" 5
13130   fi
13131  
13132 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
13133 < $as_echo_n "checking for library containing inet_ntoa... " >&6; }
13134 < if ${ac_cv_search_inet_ntoa+:} false; then :
13132 > fi
13133 >
13134 >  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
13135 > if test "x$ac_cv_func_getnameinfo" = xyes; then :
13136 >
13137 > else
13138 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
13139 > $as_echo_n "checking for library containing getnameinfo... " >&6; }
13140 > if ${ac_cv_search_getnameinfo+:} false; then :
13141    $as_echo_n "(cached) " >&6
13142   else
13143    ac_func_search_save_LIBS=$LIBS
# Line 13096 | Line 13150 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13150   #ifdef __cplusplus
13151   extern "C"
13152   #endif
13153 < char inet_ntoa ();
13153 > char getnameinfo ();
13154   int
13155   main ()
13156   {
13157 < return inet_ntoa ();
13157 > return getnameinfo ();
13158    ;
13159    return 0;
13160   }
# Line 13113 | Line 13167 | for ac_lib in '' nsl; do
13167      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13168    fi
13169    if ac_fn_c_try_link "$LINENO"; then :
13170 <  ac_cv_search_inet_ntoa=$ac_res
13170 >  ac_cv_search_getnameinfo=$ac_res
13171   fi
13172   rm -f core conftest.err conftest.$ac_objext \
13173      conftest$ac_exeext
13174 <  if ${ac_cv_search_inet_ntoa+:} false; then :
13174 >  if ${ac_cv_search_getnameinfo+:} false; then :
13175    break
13176   fi
13177   done
13178 < if ${ac_cv_search_inet_ntoa+:} false; then :
13178 > if ${ac_cv_search_getnameinfo+:} false; then :
13179  
13180   else
13181 <  ac_cv_search_inet_ntoa=no
13181 >  ac_cv_search_getnameinfo=no
13182   fi
13183   rm conftest.$ac_ext
13184   LIBS=$ac_func_search_save_LIBS
13185   fi
13186 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5
13187 < $as_echo "$ac_cv_search_inet_ntoa" >&6; }
13188 < ac_res=$ac_cv_search_inet_ntoa
13186 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5
13187 > $as_echo "$ac_cv_search_getnameinfo" >&6; }
13188 > ac_res=$ac_cv_search_getnameinfo
13189   if test "$ac_res" != no; then :
13190    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13191  
13192   fi
13193  
13194 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
13195 < $as_echo_n "checking for library containing inet_aton... " >&6; }
13196 < if ${ac_cv_search_inet_aton+:} false; then :
13194 > fi
13195 >
13196 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13197 > $as_echo_n "checking for library containing socket... " >&6; }
13198 > if ${ac_cv_search_socket+:} false; then :
13199    $as_echo_n "(cached) " >&6
13200   else
13201    ac_func_search_save_LIBS=$LIBS
# Line 13152 | Line 13208 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13208   #ifdef __cplusplus
13209   extern "C"
13210   #endif
13211 < char inet_aton ();
13211 > char socket ();
13212   int
13213   main ()
13214   {
13215 < return inet_aton ();
13215 > return socket ();
13216    ;
13217    return 0;
13218   }
13219   _ACEOF
13220 < for ac_lib in '' resolv; do
13220 > for ac_lib in '' socket; do
13221    if test -z "$ac_lib"; then
13222      ac_res="none required"
13223    else
# Line 13169 | Line 13225 | for ac_lib in '' resolv; do
13225      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13226    fi
13227    if ac_fn_c_try_link "$LINENO"; then :
13228 <  ac_cv_search_inet_aton=$ac_res
13228 >  ac_cv_search_socket=$ac_res
13229   fi
13230   rm -f core conftest.err conftest.$ac_objext \
13231      conftest$ac_exeext
13232 <  if ${ac_cv_search_inet_aton+:} false; then :
13232 >  if ${ac_cv_search_socket+:} false; then :
13233    break
13234   fi
13235   done
13236 < if ${ac_cv_search_inet_aton+:} false; then :
13236 > if ${ac_cv_search_socket+:} false; then :
13237  
13238   else
13239 <  ac_cv_search_inet_aton=no
13239 >  ac_cv_search_socket=no
13240   fi
13241   rm conftest.$ac_ext
13242   LIBS=$ac_func_search_save_LIBS
13243   fi
13244 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
13245 < $as_echo "$ac_cv_search_inet_aton" >&6; }
13246 < ac_res=$ac_cv_search_inet_aton
13244 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13245 > $as_echo "$ac_cv_search_socket" >&6; }
13246 > ac_res=$ac_cv_search_socket
13247   if test "$ac_res" != no; then :
13248    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13249  
13250 + else
13251 +  as_fn_error $? "socket library not found" "$LINENO" 5
13252   fi
13253  
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
13254    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13255     #include <sys/socket.h>
13256     #include <netdb.h>
# Line 13521 | Line 13567 | done
13567  
13568  
13569  
13524
13525
13570   # Checks for header files.
13571  
13572  
# Line 13684 | Line 13728 | fi
13728   fi
13729  
13730  
13731 + # Check whether --enable-libGeoIP was given.
13732 + if test "${enable_libGeoIP+set}" = set; then :
13733 +  enableval=$enable_libGeoIP;
13734 + else
13735 +  ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
13736 + if test "x$ac_cv_header_GeoIP_h" = xyes; then :
13737 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GeoIP_id_by_ipnum_v6_gl" >&5
13738 + $as_echo_n "checking for library containing GeoIP_id_by_ipnum_v6_gl... " >&6; }
13739 + if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13740 +  $as_echo_n "(cached) " >&6
13741 + else
13742 +  ac_func_search_save_LIBS=$LIBS
13743 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13744 + /* end confdefs.h.  */
13745 +
13746 + /* Override any GCC internal prototype to avoid an error.
13747 +   Use char because int might match the return type of a GCC
13748 +   builtin and then its argument prototype would still apply.  */
13749 + #ifdef __cplusplus
13750 + extern "C"
13751 + #endif
13752 + char GeoIP_id_by_ipnum_v6_gl ();
13753 + int
13754 + main ()
13755 + {
13756 + return GeoIP_id_by_ipnum_v6_gl ();
13757 +  ;
13758 +  return 0;
13759 + }
13760 + _ACEOF
13761 + for ac_lib in '' GeoIP; do
13762 +  if test -z "$ac_lib"; then
13763 +    ac_res="none required"
13764 +  else
13765 +    ac_res=-l$ac_lib
13766 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13767 +  fi
13768 +  if ac_fn_c_try_link "$LINENO"; then :
13769 +  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=$ac_res
13770 + fi
13771 + rm -f core conftest.err conftest.$ac_objext \
13772 +    conftest$ac_exeext
13773 +  if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13774 +  break
13775 + fi
13776 + done
13777 + if ${ac_cv_search_GeoIP_id_by_ipnum_v6_gl+:} false; then :
13778 +
13779 + else
13780 +  ac_cv_search_GeoIP_id_by_ipnum_v6_gl=no
13781 + fi
13782 + rm conftest.$ac_ext
13783 + LIBS=$ac_func_search_save_LIBS
13784 + fi
13785 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&5
13786 + $as_echo "$ac_cv_search_GeoIP_id_by_ipnum_v6_gl" >&6; }
13787 + ac_res=$ac_cv_search_GeoIP_id_by_ipnum_v6_gl
13788 + if test "$ac_res" != no; then :
13789 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13790 +
13791 + $as_echo "#define HAVE_LIBGEOIP 1" >>confdefs.h
13792 +
13793 + fi
13794 +
13795 + fi
13796 +
13797 +
13798 + fi
13799 +
13800 +
13801   # Check whether --enable-openssl was given.
13802   if test "${enable_openssl+set}" = set; then :
13803    enableval=$enable_openssl;  cf_enable_openssl=$enableval
# Line 13738 | Line 13852 | $as_echo "disabled" >&6; }
13852   fi
13853  
13854   if test "$cf_enable_openssl" != "no"; then :
13855 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8 or above" >&5
13856 < $as_echo_n "checking for OpenSSL 0.9.8 or above... " >&6; }
13855 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL 0.9.8s or above" >&5
13856 > $as_echo_n "checking for OpenSSL 0.9.8s or above... " >&6; }
13857    if test "$cross_compiling" = yes; then :
13858    cf_openssl_version_ok=no
13859   else
# Line 13752 | Line 13866 | else
13866   int
13867   main ()
13868   {
13869 < exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000));
13869 > exit(!(OPENSSL_VERSION_NUMBER >= 0x0090813f));
13870    ;
13871    return 0;
13872   }
# Line 13771 | Line 13885 | fi
13885    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
13886   $as_echo "found" >&6; }
13887  
13888 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13889 < $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13890 < if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13888 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13889 > $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13890 > if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13891    $as_echo_n "(cached) " >&6
13892   else
13893    ac_check_lib_save_LIBS=$LIBS
13894 < LIBS="-lssl  $LIBS"
13894 > LIBS="-lcrypto  $LIBS"
13895   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13896   /* end confdefs.h.  */
13897  
# Line 13787 | Line 13901 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13901   #ifdef __cplusplus
13902   extern "C"
13903   #endif
13904 < char SSL_connect ();
13904 > char RSA_free ();
13905   int
13906   main ()
13907   {
13908 < return SSL_connect ();
13908 > return RSA_free ();
13909    ;
13910    return 0;
13911   }
13912   _ACEOF
13913   if ac_fn_c_try_link "$LINENO"; then :
13914 <  ac_cv_lib_ssl_SSL_connect=yes
13914 >  ac_cv_lib_crypto_RSA_free=yes
13915   else
13916 <  ac_cv_lib_ssl_SSL_connect=no
13916 >  ac_cv_lib_crypto_RSA_free=no
13917   fi
13918   rm -f core conftest.err conftest.$ac_objext \
13919      conftest$ac_exeext conftest.$ac_ext
13920   LIBS=$ac_check_lib_save_LIBS
13921   fi
13922 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13923 < $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13924 < if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13922 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13923 > $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13924 > if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13925    cat >>confdefs.h <<_ACEOF
13926 < #define HAVE_LIBSSL 1
13926 > #define HAVE_LIBCRYPTO 1
13927   _ACEOF
13928  
13929 <  LIBS="-lssl $LIBS"
13929 >  LIBS="-lcrypto $LIBS"
13930  
13931   fi
13932  
13933 <    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
13934 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13935 < $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13936 < if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13933 >    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
13934 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13935 > $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13936 > if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13937    $as_echo_n "(cached) " >&6
13938   else
13939    ac_check_lib_save_LIBS=$LIBS
13940 < LIBS="-lcrypto  $LIBS"
13940 > LIBS="-lssl  $LIBS"
13941   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13942   /* end confdefs.h.  */
13943  
# Line 13833 | Line 13947 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13947   #ifdef __cplusplus
13948   extern "C"
13949   #endif
13950 < char RSA_free ();
13950 > char SSL_connect ();
13951   int
13952   main ()
13953   {
13954 < return RSA_free ();
13954 > return SSL_connect ();
13955    ;
13956    return 0;
13957   }
13958   _ACEOF
13959   if ac_fn_c_try_link "$LINENO"; then :
13960 <  ac_cv_lib_crypto_RSA_free=yes
13960 >  ac_cv_lib_ssl_SSL_connect=yes
13961   else
13962 <  ac_cv_lib_crypto_RSA_free=no
13962 >  ac_cv_lib_ssl_SSL_connect=no
13963   fi
13964   rm -f core conftest.err conftest.$ac_objext \
13965      conftest$ac_exeext conftest.$ac_ext
13966   LIBS=$ac_check_lib_save_LIBS
13967   fi
13968 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13969 < $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13970 < if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13968 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13969 > $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13970 > if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13971    cat >>confdefs.h <<_ACEOF
13972 < #define HAVE_LIBCRYPTO 1
13972 > #define HAVE_LIBSSL 1
13973   _ACEOF
13974  
13975 <  LIBS="-lcrypto $LIBS"
13975 >  LIBS="-lssl $LIBS"
13976  
13977   fi
13978  
# Line 13871 | Line 13985 | $as_echo "no - OpenSSL support disabled"
13985   fi
13986   fi
13987  
13988 < if test "$ac_cv_lib_crypto_RSA_free" = yes; then
13988 > if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
13989    ENABLE_SSL_TRUE=
13990    ENABLE_SSL_FALSE='#'
13991   else
# Line 13896 | Line 14010 | $as_echo "#define NDEBUG 1" >>confdefs.h
14010   fi
14011  
14012  
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
14013  
14014 <
13919 < $as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h
13920 <
13921 <
13922 < $as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
13923 <
13924 <
13925 < $as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
13926 <
13927 <
13928 < $as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
13929 <
13930 <
13931 < $as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h
13932 <
13933 <
13934 < $as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h
13935 <
13936 <
13937 < $as_echo "#define DNS_HEAP_SIZE 128" >>confdefs.h
13938 <
13939 < else
14014 > $as_echo "#define NICKNAMEHISTORYLENGTH 32768" >>confdefs.h
14015  
14016  
14017 + $as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h
14018  
13943 $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h
14019  
14020 + $as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h
14021  
13946 $as_echo "#define CHANNEL_HEAP_SIZE 1024" >>confdefs.h
14022  
14023 + $as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h
14024  
13949 $as_echo "#define BAN_HEAP_SIZE 1024" >>confdefs.h
14025  
14026 + $as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h
14027  
13952 $as_echo "#define CLIENT_HEAP_SIZE 1024" >>confdefs.h
14028  
14029 + $as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h
14030  
13955 $as_echo "#define LCLIENT_HEAP_SIZE 512" >>confdefs.h
14031  
14032 + $as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h
14033  
13958 $as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h
14034  
14035 + $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
14036  
13961 $as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h
14037  
14038 + $as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h
14039  
13964 $as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h
14040  
14041 + $as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h
14042  
13967 $as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h
14043  
14044 <
13970 < $as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h
13971 <
13972 < fi
14044 > $as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h
14045  
14046  
14047   # Argument processing.
# Line 13990 | Line 14062 | if test "${enable_devpoll+set}" = set; t
14062    enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll"
14063   fi
14064  
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
14065    # Check whether --enable-poll was given.
14066   if test "${enable_poll+set}" = set; then :
14067    enableval=$enable_poll; desired_iopoll_mechanism="poll"
# Line 14178 | Line 14245 | rm -f core conftest.err conftest.$ac_obj
14245   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14246  
14247    fi
14248 <      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
14248 >      iopoll_mechanism_poll=4
14249  
14250   cat >>confdefs.h <<_ACEOF
14251   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14273 | Line 14299 | else
14299   fi
14300   rm -f core conftest.err conftest.$ac_objext \
14301      conftest$ac_exeext conftest.$ac_ext
14302 <      iopoll_mechanism_select=6
14302 >      iopoll_mechanism_select=5
14303  
14304   cat >>confdefs.h <<_ACEOF
14305   #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
# Line 14328 | Line 14354 | fi
14354   rm -f core conftest.err conftest.$ac_objext \
14355      conftest$ac_exeext conftest.$ac_ext
14356        optimal_iopoll_mechanism="none"
14357 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
14357 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14358      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14359      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14360        optimal_iopoll_mechanism="$mechanism"
# Line 14365 | Line 14391 | _ACEOF
14391  
14392  
14393  
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
14394    # Check whether --enable-halfops was given.
14395   if test "${enable_halfops+set}" = set; then :
14396    enableval=$enable_halfops; halfops="$enableval"
# Line 14417 | Line 14413 | else
14413   fi
14414  
14415    if test "$debugging" = "yes" ; then
14420
14421 $as_echo "#define DEBUG 1" >>confdefs.h
14422
14416      CFLAGS="-Wall -g -O0"
14424  else
14425
14426 $as_echo "#define NDEBUG 1" >>confdefs.h
14427
14417    fi
14418  
14419  
# Line 14526 | Line 14515 | _ACEOF
14515    test "$exec_prefix_NONE" && exec_prefix=NONE
14516  
14517  
14518 < 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"
14518 > 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"
14519  
14520  
14521   cat >confcache <<\_ACEOF
# Line 15093 | Line 15082 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
15082   # report actual input values of CONFIG_FILES etc. instead of their
15083   # values after options handling.
15084   ac_log="
15085 < This file was extended by ircd-hybrid $as_me 8beta1, which was
15085 > This file was extended by ircd-hybrid $as_me TRUNK, which was
15086   generated by GNU Autoconf 2.69.  Invocation command line was
15087  
15088    CONFIG_FILES    = $CONFIG_FILES
# Line 15159 | Line 15148 | _ACEOF
15148   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15149   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15150   ac_cs_version="\\
15151 < ircd-hybrid config.status 8beta1
15151 > ircd-hybrid config.status TRUNK
15152   configured by $0, generated by GNU Autoconf 2.69,
15153    with options \\"\$ac_cs_config\\"
15154  
# Line 15569 | Line 15558 | do
15558      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
15559      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
15560      "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" ;;
15561      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
15562      "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
15576    "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;;
15563      "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
15564      "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;;
15565      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
# Line 16177 | Line 16163 | $as_echo "$as_me: executing $ac_file com
16163  
16164    case $ac_file$ac_mode in
16165      "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
16166 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
16166 >  # Older Autoconf quotes --file arguments for eval, but not when files
16167    # are listed without --file.  Let's play safe and only enable the eval
16168    # if we detect the quoting.
16169    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 1908 by michael, Sat Apr 27 21:25:11 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

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