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

Comparing:
ircd-hybrid-8/configure (file contents), Revision 1373 by michael, Fri Apr 27 07:32:34 2012 UTC vs.
ircd-hybrid/trunk/configure (file contents), Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC

# Line 1 | Line 1
1   #! /bin/sh
2 < # From configure.ac Id: configure.ac 1358 2012-04-22 13:49:23Z michael .
2 > # From configure.ac Id: configure.ac 1720 2012-12-28 21:06:21Z 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 648 | Line 648 | DATADIR
648   LIBDIR
649   SYSCONFDIR
650   PREFIX
651 EFNET_FALSE
652 EFNET_TRUE
651   ENABLE_SSL_FALSE
652   ENABLE_SSL_TRUE
653   LTDLOPEN
# Line 725 | 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 789 | 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 805 | Line 808 | enable_ltdl_install
808   enable_libpcre
809   enable_openssl
810   enable_assert
808 enable_small_net
811   enable_kqueue
812   enable_epoll
813   enable_devpoll
812 enable_rtsigio
814   enable_poll
815   enable_select
816   with_nicklen
817   with_topiclen
817 enable_efnet
818   enable_halfops
819   enable_debugging
820   enable_warnings
# Line 1370 | Line 1370 | if test "$ac_init_help" = "long"; then
1370    # Omit some internal or obsolete options to make the list less imposing.
1371    # This message is too long to be a string in the A/UX 3.1 sh.
1372    cat <<_ACEOF
1373 < \`configure' configures ircd-hybrid 8beta1 to adapt to many kinds of systems.
1373 > \`configure' configures ircd-hybrid TRUNK to adapt to many kinds of systems.
1374  
1375   Usage: $0 [OPTION]... [VAR=VALUE]...
1376  
# Line 1440 | Line 1440 | fi
1440  
1441   if test -n "$ac_init_help"; then
1442    case $ac_init_help in
1443 <     short | recursive ) echo "Configuration of ircd-hybrid 8beta1:";;
1443 >     short | recursive ) echo "Configuration of ircd-hybrid TRUNK:";;
1444     esac
1445    cat <<\_ACEOF
1446  
# Line 1448 | Line 1448 | Optional Features:
1448    --disable-option-checking  ignore unrecognized --enable/--with options
1449    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1450    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1451 +  --enable-silent-rules   less verbose build output (undo: "make V=1")
1452 +  --disable-silent-rules  verbose build output (undo: "make V=0")
1453    --enable-maintainer-mode
1454                            enable make rules and dependencies not useful (and
1455                            sometimes confusing) to the casual installer
# Line 1465 | Line 1467 | Optional Features:
1467    --enable-openssl=DIR       Enable OpenSSL support (DIR optional).
1468    --disable-openssl            Disable OpenSSL support.
1469    --enable-assert         Enable assert() statements
1468  --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.
1472  --enable-rtsigio        Force rtsigio usage.
1473    --enable-poll           Force poll usage.
1474    --enable-select         Force select usage.
1475  --enable-efnet          For IRCDs running on EFnet.
1475    --enable-halfops        Enable halfops support.
1476    --enable-debugging      Enable debugging.
1477    --enable-warnings       Enable compiler warnings.
# Line 1573 | Line 1572 | fi
1572   test -n "$ac_init_help" && exit $ac_status
1573   if $ac_init_version; then
1574    cat <<\_ACEOF
1575 < ircd-hybrid configure 8beta1
1575 > ircd-hybrid configure TRUNK
1576   generated by GNU Autoconf 2.69
1577  
1578   Copyright (C) 2012 Free Software Foundation, Inc.
# Line 2099 | Line 2098 | cat >config.log <<_ACEOF
2098   This file contains any messages produced by compilers while
2099   running configure, to aid debugging if configure makes a mistake.
2100  
2101 < It was created by ircd-hybrid $as_me 8beta1, which was
2101 > It was created by ircd-hybrid $as_me TRUNK, which was
2102   generated by GNU Autoconf 2.69.  Invocation command line was
2103  
2104    $ $0 $@
# Line 2379 | Line 2378 | $as_echo "$as_me: creating cache $cache_
2378    >$cache_file
2379   fi
2380  
2382 as_fn_append ac_func_list " mmap"
2381   as_fn_append ac_func_list " strtok_r"
2382   as_fn_append ac_func_list " usleep"
2383   as_fn_append ac_func_list " strlcat"
# Line 2459 | Line 2457 | ac_link='$CC -o conftest$ac_exeext $CFLA
2457   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2458  
2459  
2460 < am__api_version='1.12'
2460 > am__api_version='1.13'
2461  
2462   ac_aux_dir=
2463   for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
# Line 2672 | Line 2670 | if test x"${MISSING+set}" != xset; then
2670    esac
2671   fi
2672   # Use eval to expand $SHELL
2673 < if eval "$MISSING --run true"; then
2674 <  am_missing_run="$MISSING --run "
2673 > if eval "$MISSING --is-lightweight"; then
2674 >  am_missing_run="$MISSING "
2675   else
2676    am_missing_run=
2677    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
# Line 2831 | Line 2829 | fi
2829   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2830   $as_echo "$MKDIR_P" >&6; }
2831  
2834 mkdir_p="$MKDIR_P"
2835 case $mkdir_p in
2836  [\\/$]* | ?:[\\/]*) ;;
2837  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2838 esac
2839
2832   for ac_prog in gawk mawk nawk awk
2833   do
2834    # Extract the first word of "$ac_prog", so it can be a program name with args.
# Line 2919 | Line 2911 | else
2911   fi
2912   rmdir .tst 2>/dev/null
2913  
2914 + # Check whether --enable-silent-rules was given.
2915 + if test "${enable_silent_rules+set}" = set; then :
2916 +  enableval=$enable_silent_rules;
2917 + fi
2918 +
2919 + case $enable_silent_rules in # (((
2920 +  yes) AM_DEFAULT_VERBOSITY=0;;
2921 +   no) AM_DEFAULT_VERBOSITY=1;;
2922 +    *) AM_DEFAULT_VERBOSITY=1;;
2923 + esac
2924 + am_make=${MAKE-make}
2925 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2926 + $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2927 + if ${am_cv_make_support_nested_variables+:} false; then :
2928 +  $as_echo_n "(cached) " >&6
2929 + else
2930 +  if $as_echo 'TRUE=$(BAR$(V))
2931 + BAR0=false
2932 + BAR1=true
2933 + V=1
2934 + am__doit:
2935 +        @$(TRUE)
2936 + .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2937 +  am_cv_make_support_nested_variables=yes
2938 + else
2939 +  am_cv_make_support_nested_variables=no
2940 + fi
2941 + fi
2942 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2943 + $as_echo "$am_cv_make_support_nested_variables" >&6; }
2944 + if test $am_cv_make_support_nested_variables = yes; then
2945 +    AM_V='$(V)'
2946 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2947 + else
2948 +  AM_V=$AM_DEFAULT_VERBOSITY
2949 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2950 + fi
2951 + AM_BACKSLASH='\'
2952 +
2953   if test "`cd $srcdir && pwd`" != "`pwd`"; then
2954    # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2955    # is not polluted with repeated "-I."
# Line 2941 | Line 2972 | fi
2972  
2973   # Define the identity of the package.
2974   PACKAGE='ircd-hybrid'
2975 < VERSION='8beta1'
2975 > VERSION='TRUNK'
2976  
2977  
2978   cat >>confdefs.h <<_ACEOF
# Line 2969 | Line 3000 | AUTOHEADER=${AUTOHEADER-"${am_missing_ru
3000  
3001   MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3002  
3003 + # For better backward compatibility.  To be removed once Automake 1.9.x
3004 + # dies out for good.  For more background, see:
3005 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3006 + # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3007 + mkdir_p='$(MKDIR_P)'
3008 +
3009   # We need awk for the "check" target.  The system "awk" is bad on
3010   # some platforms.
3011   # Always define AMTAR for backward compatibility.  Yes, it's still used
# Line 13034 | Line 13071 | LIBTOOL="$LIBTOOL --silent"
13071  
13072   # Checks for libraries.
13073  
13074 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13075 < $as_echo_n "checking for library containing socket... " >&6; }
13076 < if ${ac_cv_search_socket+:} false; then :
13074 >  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
13075 > if test "x$ac_cv_func_getaddrinfo" = xyes; then :
13076 >
13077 > else
13078 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
13079 > $as_echo_n "checking for library containing getaddrinfo... " >&6; }
13080 > if ${ac_cv_search_getaddrinfo+:} false; then :
13081    $as_echo_n "(cached) " >&6
13082   else
13083    ac_func_search_save_LIBS=$LIBS
# Line 13049 | Line 13090 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13090   #ifdef __cplusplus
13091   extern "C"
13092   #endif
13093 < char socket ();
13093 > char getaddrinfo ();
13094   int
13095   main ()
13096   {
13097 < return socket ();
13097 > return getaddrinfo ();
13098    ;
13099    return 0;
13100   }
13101   _ACEOF
13102 < for ac_lib in '' socket; do
13102 > for ac_lib in '' nsl; do
13103    if test -z "$ac_lib"; then
13104      ac_res="none required"
13105    else
# Line 13066 | Line 13107 | for ac_lib in '' socket; do
13107      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13108    fi
13109    if ac_fn_c_try_link "$LINENO"; then :
13110 <  ac_cv_search_socket=$ac_res
13110 >  ac_cv_search_getaddrinfo=$ac_res
13111   fi
13112   rm -f core conftest.err conftest.$ac_objext \
13113      conftest$ac_exeext
13114 <  if ${ac_cv_search_socket+:} false; then :
13114 >  if ${ac_cv_search_getaddrinfo+:} false; then :
13115    break
13116   fi
13117   done
13118 < if ${ac_cv_search_socket+:} false; then :
13118 > if ${ac_cv_search_getaddrinfo+:} false; then :
13119  
13120   else
13121 <  ac_cv_search_socket=no
13121 >  ac_cv_search_getaddrinfo=no
13122   fi
13123   rm conftest.$ac_ext
13124   LIBS=$ac_func_search_save_LIBS
13125   fi
13126 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13127 < $as_echo "$ac_cv_search_socket" >&6; }
13128 < ac_res=$ac_cv_search_socket
13126 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
13127 > $as_echo "$ac_cv_search_getaddrinfo" >&6; }
13128 > ac_res=$ac_cv_search_getaddrinfo
13129   if test "$ac_res" != no; then :
13130    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13131  
13091 else
13092  as_fn_error $? "socket library not found" "$LINENO" 5
13132   fi
13133  
13134 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
13135 < $as_echo_n "checking for library containing inet_ntoa... " >&6; }
13136 < if ${ac_cv_search_inet_ntoa+:} false; then :
13134 > fi
13135 >
13136 >  ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
13137 > if test "x$ac_cv_func_getnameinfo" = xyes; then :
13138 >
13139 > else
13140 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
13141 > $as_echo_n "checking for library containing getnameinfo... " >&6; }
13142 > if ${ac_cv_search_getnameinfo+:} false; then :
13143    $as_echo_n "(cached) " >&6
13144   else
13145    ac_func_search_save_LIBS=$LIBS
# Line 13107 | Line 13152 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13152   #ifdef __cplusplus
13153   extern "C"
13154   #endif
13155 < char inet_ntoa ();
13155 > char getnameinfo ();
13156   int
13157   main ()
13158   {
13159 < return inet_ntoa ();
13159 > return getnameinfo ();
13160    ;
13161    return 0;
13162   }
# Line 13124 | Line 13169 | for ac_lib in '' nsl; do
13169      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13170    fi
13171    if ac_fn_c_try_link "$LINENO"; then :
13172 <  ac_cv_search_inet_ntoa=$ac_res
13172 >  ac_cv_search_getnameinfo=$ac_res
13173   fi
13174   rm -f core conftest.err conftest.$ac_objext \
13175      conftest$ac_exeext
13176 <  if ${ac_cv_search_inet_ntoa+:} false; then :
13176 >  if ${ac_cv_search_getnameinfo+:} false; then :
13177    break
13178   fi
13179   done
13180 < if ${ac_cv_search_inet_ntoa+:} false; then :
13180 > if ${ac_cv_search_getnameinfo+:} false; then :
13181  
13182   else
13183 <  ac_cv_search_inet_ntoa=no
13183 >  ac_cv_search_getnameinfo=no
13184   fi
13185   rm conftest.$ac_ext
13186   LIBS=$ac_func_search_save_LIBS
13187   fi
13188 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5
13189 < $as_echo "$ac_cv_search_inet_ntoa" >&6; }
13190 < ac_res=$ac_cv_search_inet_ntoa
13188 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5
13189 > $as_echo "$ac_cv_search_getnameinfo" >&6; }
13190 > ac_res=$ac_cv_search_getnameinfo
13191   if test "$ac_res" != no; then :
13192    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13193  
13194   fi
13195  
13196 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5
13197 < $as_echo_n "checking for library containing inet_aton... " >&6; }
13198 < if ${ac_cv_search_inet_aton+:} false; then :
13196 > fi
13197 >
13198 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
13199 > $as_echo_n "checking for library containing socket... " >&6; }
13200 > if ${ac_cv_search_socket+:} false; then :
13201    $as_echo_n "(cached) " >&6
13202   else
13203    ac_func_search_save_LIBS=$LIBS
# Line 13163 | Line 13210 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13210   #ifdef __cplusplus
13211   extern "C"
13212   #endif
13213 < char inet_aton ();
13213 > char socket ();
13214   int
13215   main ()
13216   {
13217 < return inet_aton ();
13217 > return socket ();
13218    ;
13219    return 0;
13220   }
13221   _ACEOF
13222 < for ac_lib in '' resolv; do
13222 > for ac_lib in '' socket; do
13223    if test -z "$ac_lib"; then
13224      ac_res="none required"
13225    else
# Line 13180 | Line 13227 | for ac_lib in '' resolv; do
13227      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
13228    fi
13229    if ac_fn_c_try_link "$LINENO"; then :
13230 <  ac_cv_search_inet_aton=$ac_res
13230 >  ac_cv_search_socket=$ac_res
13231   fi
13232   rm -f core conftest.err conftest.$ac_objext \
13233      conftest$ac_exeext
13234 <  if ${ac_cv_search_inet_aton+:} false; then :
13234 >  if ${ac_cv_search_socket+:} false; then :
13235    break
13236   fi
13237   done
13238 < if ${ac_cv_search_inet_aton+:} false; then :
13238 > if ${ac_cv_search_socket+:} false; then :
13239  
13240   else
13241 <  ac_cv_search_inet_aton=no
13241 >  ac_cv_search_socket=no
13242   fi
13243   rm conftest.$ac_ext
13244   LIBS=$ac_func_search_save_LIBS
13245   fi
13246 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5
13247 < $as_echo "$ac_cv_search_inet_aton" >&6; }
13248 < ac_res=$ac_cv_search_inet_aton
13246 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
13247 > $as_echo "$ac_cv_search_socket" >&6; }
13248 > ac_res=$ac_cv_search_socket
13249   if test "$ac_res" != no; then :
13250    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13251  
13252 + else
13253 +  as_fn_error $? "socket library not found" "$LINENO" 5
13254   fi
13255  
13207  for ac_func in inet_aton inet_ntop inet_pton
13208 do :
13209  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13210 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13211 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
13212  cat >>confdefs.h <<_ACEOF
13213 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13214 _ACEOF
13215
13216 fi
13217 done
13218
13256    ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include <sys/types.h>
13257     #include <sys/socket.h>
13258     #include <netdb.h>
# Line 13532 | Line 13569 | done
13569  
13570  
13571  
13535
13536
13572   # Checks for header files.
13573  
13574  
# Line 13782 | Line 13817 | fi
13817    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
13818   $as_echo "found" >&6; }
13819  
13820 <    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13821 < $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13822 < if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13820 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13821 > $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13822 > if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13823    $as_echo_n "(cached) " >&6
13824   else
13825    ac_check_lib_save_LIBS=$LIBS
13826 < LIBS="-lssl  $LIBS"
13826 > LIBS="-lcrypto  $LIBS"
13827   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13828   /* end confdefs.h.  */
13829  
# Line 13798 | Line 13833 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13833   #ifdef __cplusplus
13834   extern "C"
13835   #endif
13836 < char SSL_connect ();
13836 > char RSA_free ();
13837   int
13838   main ()
13839   {
13840 < return SSL_connect ();
13840 > return RSA_free ();
13841    ;
13842    return 0;
13843   }
13844   _ACEOF
13845   if ac_fn_c_try_link "$LINENO"; then :
13846 <  ac_cv_lib_ssl_SSL_connect=yes
13846 >  ac_cv_lib_crypto_RSA_free=yes
13847   else
13848 <  ac_cv_lib_ssl_SSL_connect=no
13848 >  ac_cv_lib_crypto_RSA_free=no
13849   fi
13850   rm -f core conftest.err conftest.$ac_objext \
13851      conftest$ac_exeext conftest.$ac_ext
13852   LIBS=$ac_check_lib_save_LIBS
13853   fi
13854 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13855 < $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13856 < if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13854 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13855 > $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13856 > if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13857    cat >>confdefs.h <<_ACEOF
13858 < #define HAVE_LIBSSL 1
13858 > #define HAVE_LIBCRYPTO 1
13859   _ACEOF
13860  
13861 <  LIBS="-lssl $LIBS"
13861 >  LIBS="-lcrypto $LIBS"
13862  
13863   fi
13864  
13865 <    if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then :
13866 <  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
13867 < $as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
13868 < if ${ac_cv_lib_crypto_RSA_free+:} false; then :
13865 >    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
13866 >  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
13867 > $as_echo_n "checking for SSL_connect in -lssl... " >&6; }
13868 > if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
13869    $as_echo_n "(cached) " >&6
13870   else
13871    ac_check_lib_save_LIBS=$LIBS
13872 < LIBS="-lcrypto  $LIBS"
13872 > LIBS="-lssl  $LIBS"
13873   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13874   /* end confdefs.h.  */
13875  
# Line 13844 | Line 13879 | cat confdefs.h - <<_ACEOF >conftest.$ac_
13879   #ifdef __cplusplus
13880   extern "C"
13881   #endif
13882 < char RSA_free ();
13882 > char SSL_connect ();
13883   int
13884   main ()
13885   {
13886 < return RSA_free ();
13886 > return SSL_connect ();
13887    ;
13888    return 0;
13889   }
13890   _ACEOF
13891   if ac_fn_c_try_link "$LINENO"; then :
13892 <  ac_cv_lib_crypto_RSA_free=yes
13892 >  ac_cv_lib_ssl_SSL_connect=yes
13893   else
13894 <  ac_cv_lib_crypto_RSA_free=no
13894 >  ac_cv_lib_ssl_SSL_connect=no
13895   fi
13896   rm -f core conftest.err conftest.$ac_objext \
13897      conftest$ac_exeext conftest.$ac_ext
13898   LIBS=$ac_check_lib_save_LIBS
13899   fi
13900 < { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
13901 < $as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
13902 < if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
13900 > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
13901 > $as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
13902 > if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
13903    cat >>confdefs.h <<_ACEOF
13904 < #define HAVE_LIBCRYPTO 1
13904 > #define HAVE_LIBSSL 1
13905   _ACEOF
13906  
13907 <  LIBS="-lcrypto $LIBS"
13907 >  LIBS="-lssl $LIBS"
13908  
13909   fi
13910  
# Line 13882 | Line 13917 | $as_echo "no - OpenSSL support disabled"
13917   fi
13918   fi
13919  
13920 < if test "$ac_cv_lib_crypto_RSA_free" = yes; then
13920 > if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
13921    ENABLE_SSL_TRUE=
13922    ENABLE_SSL_FALSE='#'
13923   else
# Line 13907 | Line 13942 | $as_echo "#define NDEBUG 1" >>confdefs.h
13942   fi
13943  
13944  
13910 # Check whether --enable-small-net was given.
13911 if test "${enable_small_net+set}" = set; then :
13912  enableval=$enable_small_net; small_net=$enableval
13913 else
13914  small_net=no
13915 fi
13916
13917
13918 if test "$small_net" = "yes"; then :
13919
13920
13921 $as_echo "#define NICKNAMEHISTORYLENGTH 2048" >>confdefs.h
13922
13923
13924 $as_echo "#define CHANNEL_HEAP_SIZE 256" >>confdefs.h
13925
13926
13927 $as_echo "#define BAN_HEAP_SIZE 128" >>confdefs.h
13928
13929
13930 $as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h
13931
13932
13933 $as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h
13934
13935
13936 $as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h
13937
13938
13939 $as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h
13940
13941
13942 $as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h
13943
13944
13945 $as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h
13946
13947
13948 $as_echo "#define DNS_HEAP_SIZE 128" >>confdefs.h
13949
13950 else
13951
13952
13945  
13946   $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h
13947  
13948  
13949 < $as_echo "#define CHANNEL_HEAP_SIZE 1024" >>confdefs.h
13949 > $as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h
13950  
13951  
13952 < $as_echo "#define BAN_HEAP_SIZE 1024" >>confdefs.h
13952 > $as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h
13953  
13954  
13955 < $as_echo "#define CLIENT_HEAP_SIZE 1024" >>confdefs.h
13955 > $as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h
13956  
13957  
13958 < $as_echo "#define LCLIENT_HEAP_SIZE 512" >>confdefs.h
13958 > $as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h
13959  
13960  
13961 < $as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h
13961 > $as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h
13962  
13963  
13964 < $as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h
13964 > $as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h
13965  
13966  
13967 < $as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h
13967 > $as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h
13968  
13969  
13970 < $as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h
13970 > $as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h
13971  
13972  
13973 < $as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h
13973 > $as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h
13974  
13975 < fi
13975 >
13976 > $as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h
13977  
13978  
13979   # Argument processing.
# Line 14001 | Line 13994 | if test "${enable_devpoll+set}" = set; t
13994    enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll"
13995   fi
13996  
14004  # Check whether --enable-rtsigio was given.
14005 if test "${enable_rtsigio+set}" = set; then :
14006  enableval=$enable_rtsigio; desired_iopoll_mechanism="rtsigio"
14007 fi
14008
13997    # Check whether --enable-poll was given.
13998   if test "${enable_poll+set}" = set; then :
13999    enableval=$enable_poll; desired_iopoll_mechanism="poll"
# Line 14189 | Line 14177 | rm -f core conftest.err conftest.$ac_obj
14177   $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h
14178  
14179    fi
14180 <      iopoll_mechanism_rtsigio=4
14193 <
14194 < cat >>confdefs.h <<_ACEOF
14195 < #define __IOPOLL_MECHANISM_RTSIGIO $iopoll_mechanism_rtsigio
14196 < _ACEOF
14197 <
14198 <  if test "$cross_compiling" = yes; then :
14199 <  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14200 < $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14201 < as_fn_error $? "cannot run test program while cross compiling
14202 < See \`config.log' for more details" "$LINENO" 5; }
14203 < else
14204 <  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14205 < /* end confdefs.h.  */
14206 <
14207 < #define _GNU_SOURCE
14208 < #include <fcntl.h>
14209 < static unsigned int have_f_setsig = 0;
14210 <
14211 < int
14212 < main ()
14213 < {
14214 <
14215 < #ifdef F_SETSIG
14216 <  have_f_setsig = 1;
14217 < #endif
14218 <  return have_f_setsig == 0;
14219 <
14220 <  ;
14221 <  return 0;
14222 < }
14223 < _ACEOF
14224 < if ac_fn_c_try_run "$LINENO"; then :
14225 <  is_rtsigio_mechanism_available="yes"
14226 < else
14227 <  is_rtsigio_mechanism_available="no"
14228 < fi
14229 < rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14230 <  conftest.$ac_objext conftest.beam conftest.$ac_ext
14231 < fi
14232 <
14233 <      iopoll_mechanism_poll=5
14180 >      iopoll_mechanism_poll=4
14181  
14182   cat >>confdefs.h <<_ACEOF
14183   #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll
# Line 14284 | Line 14231 | else
14231   fi
14232   rm -f core conftest.err conftest.$ac_objext \
14233      conftest$ac_exeext conftest.$ac_ext
14234 <      iopoll_mechanism_select=6
14234 >      iopoll_mechanism_select=5
14235  
14236   cat >>confdefs.h <<_ACEOF
14237   #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select
# Line 14339 | Line 14286 | fi
14286   rm -f core conftest.err conftest.$ac_objext \
14287      conftest$ac_exeext conftest.$ac_ext
14288        optimal_iopoll_mechanism="none"
14289 <  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
14289 >  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
14290      eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
14291      if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
14292        optimal_iopoll_mechanism="$mechanism"
# Line 14386 | Line 14333 | fi
14333  
14334  
14335   cat >>confdefs.h <<_ACEOF
14336 < #define NICKLEN ($nicklen+1)
14336 > #define NICKLEN ($nicklen)
14337   _ACEOF
14338  
14339  
# Line 14406 | Line 14353 | _ACEOF
14353  
14354  
14355  
14409  # Check whether --enable-efnet was given.
14410 if test "${enable_efnet+set}" = set; then :
14411  enableval=$enable_efnet; efnet="$enableval"
14412 else
14413  efnet="no"
14414 fi
14415
14416  if test "$efnet" = "yes" ; then
14417                use_efnet="yes"
14418
14419 $as_echo "#define EFNET 1" >>confdefs.h
14420
14421        else
14422                use_efnet="no"
14423  fi
14424   if test "$use_efnet" = "yes"; then
14425  EFNET_TRUE=
14426  EFNET_FALSE='#'
14427 else
14428  EFNET_TRUE='#'
14429  EFNET_FALSE=
14430 fi
14431
14432
14433
14356    # Check whether --enable-halfops was given.
14357   if test "${enable_halfops+set}" = set; then :
14358    enableval=$enable_halfops; halfops="$enableval"
# Line 14453 | Line 14375 | else
14375   fi
14376  
14377    if test "$debugging" = "yes" ; then
14456
14457 $as_echo "#define DEBUG 1" >>confdefs.h
14458
14378      CFLAGS="-Wall -g -O0"
14460  else
14461
14462 $as_echo "#define NDEBUG 1" >>confdefs.h
14463
14379    fi
14380  
14381  
# Line 14562 | Line 14477 | _ACEOF
14477    test "$exec_prefix_NONE" && exec_prefix=NONE
14478  
14479  
14480 < 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"
14480 > ac_config_files="$ac_config_files Makefile src/Makefile libltdl/Makefile messages/Makefile modules/Makefile modules/core/Makefile doc/Makefile help/Makefile help/opers/Makefile help/users/Makefile tools/Makefile"
14481  
14482  
14483   cat >confcache <<\_ACEOF
# Line 14732 | Line 14647 | if test -z "${ENABLE_SSL_TRUE}" && test
14647    as_fn_error $? "conditional \"ENABLE_SSL\" was never defined.
14648   Usually this means the macro was only invoked conditionally." "$LINENO" 5
14649   fi
14735 if test -z "${EFNET_TRUE}" && test -z "${EFNET_FALSE}"; then
14736  as_fn_error $? "conditional \"EFNET\" was never defined.
14737 Usually this means the macro was only invoked conditionally." "$LINENO" 5
14738 fi
14650  
14651   : "${CONFIG_STATUS=./config.status}"
14652   ac_write_fail=0
# Line 15133 | Line 15044 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
15044   # report actual input values of CONFIG_FILES etc. instead of their
15045   # values after options handling.
15046   ac_log="
15047 < This file was extended by ircd-hybrid $as_me 8beta1, which was
15047 > This file was extended by ircd-hybrid $as_me TRUNK, which was
15048   generated by GNU Autoconf 2.69.  Invocation command line was
15049  
15050    CONFIG_FILES    = $CONFIG_FILES
# Line 15199 | Line 15110 | _ACEOF
15110   cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15111   ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15112   ac_cs_version="\\
15113 < ircd-hybrid config.status 8beta1
15113 > ircd-hybrid config.status TRUNK
15114   configured by $0, generated by GNU Autoconf 2.69,
15115    with options \\"\$ac_cs_config\\"
15116  
# Line 15609 | Line 15520 | do
15520      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
15521      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
15522      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
15612    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
15613    "contrib/help/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/help/Makefile" ;;
15523      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
15524      "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
15525      "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;;
# Line 16217 | Line 16126 | $as_echo "$as_me: executing $ac_file com
16126  
16127    case $ac_file$ac_mode in
16128      "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
16129 <  # Autoconf 2.62 quotes --file arguments for eval, but not when files
16129 >  # Older Autoconf quotes --file arguments for eval, but not when files
16130    # are listed without --file.  Let's play safe and only enable the eval
16131    # if we detect the quoting.
16132    case $CONFIG_FILES in

Comparing:
ircd-hybrid-8/configure (property svn:eol-style), Revision 1373 by michael, Fri Apr 27 07:32:34 2012 UTC vs.
ircd-hybrid/trunk/configure (property svn:eol-style), Revision 1736 by michael, Sun Jan 13 09:31:46 2013 UTC

# Line 0 | Line 1
1 + native

Diff Legend

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