--- ircd-hybrid-8/configure 2012/06/29 11:33:21 1452 +++ ircd-hybrid/trunk/configure 2013/01/13 09:31:46 1736 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Id: configure.ac 1402 2012-05-09 18:42:45Z michael . +# From configure.ac Id: configure.ac 1720 2012-12-28 21:06:21Z michael . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ircd-hybrid 8beta2. +# Generated by GNU Autoconf 2.69 for ircd-hybrid TRUNK. # # Report bugs to . # @@ -593,8 +593,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ircd-hybrid' PACKAGE_TARNAME='ircd-hybrid' -PACKAGE_VERSION='8beta2' -PACKAGE_STRING='ircd-hybrid 8beta2' +PACKAGE_VERSION='TRUNK' +PACKAGE_STRING='ircd-hybrid TRUNK' PACKAGE_BUGREPORT='bugs@ircd-hybrid.org' PACKAGE_URL='' @@ -723,12 +723,17 @@ CC MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR am__leading_dot SET_MAKE AWK +mkdir_p MKDIR_P INSTALL_STRIP_PROGRAM STRIP @@ -786,6 +791,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_static @@ -802,11 +808,9 @@ enable_ltdl_install enable_libpcre enable_openssl enable_assert -enable_small_net enable_kqueue enable_epoll enable_devpoll -enable_rtsigio enable_poll enable_select with_nicklen @@ -1366,7 +1370,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ircd-hybrid 8beta2 to adapt to many kinds of systems. +\`configure' configures ircd-hybrid TRUNK to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1436,7 +1440,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ircd-hybrid 8beta2:";; + short | recursive ) echo "Configuration of ircd-hybrid TRUNK:";; esac cat <<\_ACEOF @@ -1444,6 +1448,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -1461,11 +1467,9 @@ Optional Features: --enable-openssl=DIR Enable OpenSSL support (DIR optional). --disable-openssl Disable OpenSSL support. --enable-assert Enable assert() statements - --enable-small-net Enable small network support. --enable-kqueue Force kqueue usage. --enable-epoll Force epoll usage. --enable-devpoll Force devpoll usage. - --enable-rtsigio Force rtsigio usage. --enable-poll Force poll usage. --enable-select Force select usage. --enable-halfops Enable halfops support. @@ -1568,7 +1572,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ircd-hybrid configure 8beta2 +ircd-hybrid configure TRUNK generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2094,7 +2098,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ircd-hybrid $as_me 8beta2, which was +It was created by ircd-hybrid $as_me TRUNK, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2374,7 +2378,6 @@ $as_echo "$as_me: creating cache $cache_ >$cache_file fi -as_fn_append ac_func_list " mmap" as_fn_append ac_func_list " strtok_r" as_fn_append ac_func_list " usleep" as_fn_append ac_func_list " strlcat" @@ -2454,7 +2457,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.12' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2667,8 +2670,8 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -2908,6 +2911,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2930,7 +2972,7 @@ fi # Define the identity of the package. PACKAGE='ircd-hybrid' - VERSION='8beta2' + VERSION='TRUNK' cat >>confdefs.h <<_ACEOF @@ -2958,6 +3000,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -13023,9 +13071,13 @@ LIBTOOL="$LIBTOOL --silent" # Checks for libraries. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 -$as_echo_n "checking for library containing socket... " >&6; } -if ${ac_cv_search_socket+:} false; then : + ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" +if test "x$ac_cv_func_getaddrinfo" = xyes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 +$as_echo_n "checking for library containing getaddrinfo... " >&6; } +if ${ac_cv_search_getaddrinfo+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13038,16 +13090,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char socket (); +char getaddrinfo (); int main () { -return socket (); +return getaddrinfo (); ; return 0; } _ACEOF -for ac_lib in '' socket; do +for ac_lib in '' nsl; do if test -z "$ac_lib"; then ac_res="none required" else @@ -13055,35 +13107,39 @@ for ac_lib in '' socket; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_socket=$ac_res + ac_cv_search_getaddrinfo=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_socket+:} false; then : + if ${ac_cv_search_getaddrinfo+:} false; then : break fi done -if ${ac_cv_search_socket+:} false; then : +if ${ac_cv_search_getaddrinfo+:} false; then : else - ac_cv_search_socket=no + ac_cv_search_getaddrinfo=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 -$as_echo "$ac_cv_search_socket" >&6; } -ac_res=$ac_cv_search_socket +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5 +$as_echo "$ac_cv_search_getaddrinfo" >&6; } +ac_res=$ac_cv_search_getaddrinfo if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else - as_fn_error $? "socket library not found" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5 -$as_echo_n "checking for library containing inet_ntoa... " >&6; } -if ${ac_cv_search_inet_ntoa+:} false; then : +fi + + ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" +if test "x$ac_cv_func_getnameinfo" = xyes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5 +$as_echo_n "checking for library containing getnameinfo... " >&6; } +if ${ac_cv_search_getnameinfo+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13096,11 +13152,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char inet_ntoa (); +char getnameinfo (); int main () { -return inet_ntoa (); +return getnameinfo (); ; return 0; } @@ -13113,33 +13169,35 @@ for ac_lib in '' nsl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_inet_ntoa=$ac_res + ac_cv_search_getnameinfo=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_inet_ntoa+:} false; then : + if ${ac_cv_search_getnameinfo+:} false; then : break fi done -if ${ac_cv_search_inet_ntoa+:} false; then : +if ${ac_cv_search_getnameinfo+:} false; then : else - ac_cv_search_inet_ntoa=no + ac_cv_search_getnameinfo=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntoa" >&5 -$as_echo "$ac_cv_search_inet_ntoa" >&6; } -ac_res=$ac_cv_search_inet_ntoa +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getnameinfo" >&5 +$as_echo "$ac_cv_search_getnameinfo" >&6; } +ac_res=$ac_cv_search_getnameinfo if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_aton" >&5 -$as_echo_n "checking for library containing inet_aton... " >&6; } -if ${ac_cv_search_inet_aton+:} false; then : +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +$as_echo_n "checking for library containing socket... " >&6; } +if ${ac_cv_search_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13152,16 +13210,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char inet_aton (); +char socket (); int main () { -return inet_aton (); +return socket (); ; return 0; } _ACEOF -for ac_lib in '' resolv; do +for ac_lib in '' socket; do if test -z "$ac_lib"; then ac_res="none required" else @@ -13169,42 +13227,32 @@ for ac_lib in '' resolv; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_inet_aton=$ac_res + ac_cv_search_socket=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_inet_aton+:} false; then : + if ${ac_cv_search_socket+:} false; then : break fi done -if ${ac_cv_search_inet_aton+:} false; then : +if ${ac_cv_search_socket+:} false; then : else - ac_cv_search_inet_aton=no + ac_cv_search_socket=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_aton" >&5 -$as_echo "$ac_cv_search_inet_aton" >&6; } -ac_res=$ac_cv_search_inet_aton +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +$as_echo "$ac_cv_search_socket" >&6; } +ac_res=$ac_cv_search_socket if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +else + as_fn_error $? "socket library not found" "$LINENO" 5 fi - for ac_func in inet_aton inet_ntop inet_pton -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#include #include #include @@ -13521,8 +13569,6 @@ done - - # Checks for header files. @@ -13771,13 +13817,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5 -$as_echo_n "checking for SSL_connect in -lssl... " >&6; } -if ${ac_cv_lib_ssl_SSL_connect+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5 +$as_echo_n "checking for RSA_free in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_RSA_free+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" +LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13787,43 +13833,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char SSL_connect (); +char RSA_free (); int main () { -return SSL_connect (); +return RSA_free (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_SSL_connect=yes + ac_cv_lib_crypto_RSA_free=yes else - ac_cv_lib_ssl_SSL_connect=no + ac_cv_lib_crypto_RSA_free=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5 -$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; } -if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5 +$as_echo "$ac_cv_lib_crypto_RSA_free" >&6; } +if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 +#define HAVE_LIBCRYPTO 1 _ACEOF - LIBS="-lssl $LIBS" + LIBS="-lcrypto $LIBS" fi - if test "$ac_cv_lib_ssl_SSL_connect" = "yes"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5 -$as_echo_n "checking for RSA_free in -lcrypto... " >&6; } -if ${ac_cv_lib_crypto_RSA_free+:} false; then : + if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5 +$as_echo_n "checking for SSL_connect in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" +LIBS="-lssl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13833,32 +13879,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif -char RSA_free (); +char SSL_connect (); int main () { -return RSA_free (); +return SSL_connect (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_crypto_RSA_free=yes + ac_cv_lib_ssl_SSL_connect=yes else - ac_cv_lib_crypto_RSA_free=no + ac_cv_lib_ssl_SSL_connect=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5 -$as_echo "$ac_cv_lib_crypto_RSA_free" >&6; } -if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; } +if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 +#define HAVE_LIBSSL 1 _ACEOF - LIBS="-lcrypto $LIBS" + LIBS="-lssl $LIBS" fi @@ -13871,7 +13917,7 @@ $as_echo "no - OpenSSL support disabled" fi fi - if test "$ac_cv_lib_crypto_RSA_free" = yes; then + if test "$ac_cv_lib_ssl_SSL_connect" = yes; then ENABLE_SSL_TRUE= ENABLE_SSL_FALSE='#' else @@ -13896,80 +13942,38 @@ $as_echo "#define NDEBUG 1" >>confdefs.h fi -# Check whether --enable-small-net was given. -if test "${enable_small_net+set}" = set; then : - enableval=$enable_small_net; small_net=$enableval -else - small_net=no -fi - - -if test "$small_net" = "yes"; then : - - -$as_echo "#define NICKNAMEHISTORYLENGTH 2048" >>confdefs.h - - -$as_echo "#define CHANNEL_HEAP_SIZE 256" >>confdefs.h - - -$as_echo "#define BAN_HEAP_SIZE 128" >>confdefs.h - - -$as_echo "#define CLIENT_HEAP_SIZE 256" >>confdefs.h - - -$as_echo "#define LCLIENT_HEAP_SIZE 128" >>confdefs.h - - -$as_echo "#define DNODE_HEAP_SIZE 256" >>confdefs.h - - -$as_echo "#define TOPIC_HEAP_SIZE 256" >>confdefs.h - - -$as_echo "#define DBUF_HEAP_SIZE 64" >>confdefs.h - - -$as_echo "#define AUTH_HEAP_SIZE 128" >>confdefs.h - - -$as_echo "#define DNS_HEAP_SIZE 128" >>confdefs.h - -else - - $as_echo "#define NICKNAMEHISTORYLENGTH 16384" >>confdefs.h -$as_echo "#define CHANNEL_HEAP_SIZE 1024" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_CHANNEL 64*1024" >>confdefs.h -$as_echo "#define BAN_HEAP_SIZE 1024" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_MEMBER 32*1024" >>confdefs.h -$as_echo "#define CLIENT_HEAP_SIZE 1024" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_BAN 16*1024" >>confdefs.h -$as_echo "#define LCLIENT_HEAP_SIZE 512" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_CLIENT 256*1024" >>confdefs.h -$as_echo "#define DNODE_HEAP_SIZE 1024" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_LCLIENT 128*1024" >>confdefs.h -$as_echo "#define TOPIC_HEAP_SIZE 1024" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_DNODE 8*1024" >>confdefs.h -$as_echo "#define DBUF_HEAP_SIZE 512" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_DBUF 512*1024" >>confdefs.h -$as_echo "#define AUTH_HEAP_SIZE 512" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_AUTH 32*1024" >>confdefs.h -$as_echo "#define DNS_HEAP_SIZE 512" >>confdefs.h +$as_echo "#define MP_CHUNK_SIZE_DNS 16*1024" >>confdefs.h -fi + +$as_echo "#define MP_CHUNK_SIZE_WATCH 4*1024" >>confdefs.h # Argument processing. @@ -13990,11 +13994,6 @@ if test "${enable_devpoll+set}" = set; t enableval=$enable_devpoll; desired_iopoll_mechanism="devpoll" fi - # Check whether --enable-rtsigio was given. -if test "${enable_rtsigio+set}" = set; then : - enableval=$enable_rtsigio; desired_iopoll_mechanism="rtsigio" -fi - # Check whether --enable-poll was given. if test "${enable_poll+set}" = set; then : enableval=$enable_poll; desired_iopoll_mechanism="poll" @@ -14178,48 +14177,7 @@ rm -f core conftest.err conftest.$ac_obj $as_echo "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h fi - iopoll_mechanism_rtsigio=4 - -cat >>confdefs.h <<_ACEOF -#define __IOPOLL_MECHANISM_RTSIGIO $iopoll_mechanism_rtsigio -_ACEOF - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#define _GNU_SOURCE -#include -static unsigned int have_f_setsig = 0; - -int -main () -{ - -#ifdef F_SETSIG - have_f_setsig = 1; -#endif - return have_f_setsig == 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - is_rtsigio_mechanism_available="yes" -else - is_rtsigio_mechanism_available="no" -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - iopoll_mechanism_poll=5 + iopoll_mechanism_poll=4 cat >>confdefs.h <<_ACEOF #define __IOPOLL_MECHANISM_POLL $iopoll_mechanism_poll @@ -14273,7 +14231,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - iopoll_mechanism_select=6 + iopoll_mechanism_select=5 cat >>confdefs.h <<_ACEOF #define __IOPOLL_MECHANISM_SELECT $iopoll_mechanism_select @@ -14328,7 +14286,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext optimal_iopoll_mechanism="none" - for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important + for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available" if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then optimal_iopoll_mechanism="$mechanism" @@ -14417,14 +14375,7 @@ else fi if test "$debugging" = "yes" ; then - -$as_echo "#define DEBUG 1" >>confdefs.h - CFLAGS="-Wall -g -O0" - else - -$as_echo "#define NDEBUG 1" >>confdefs.h - fi @@ -14526,7 +14477,7 @@ _ACEOF test "$exec_prefix_NONE" && exec_prefix=NONE -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" +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" cat >confcache <<\_ACEOF @@ -15093,7 +15044,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ircd-hybrid $as_me 8beta2, which was +This file was extended by ircd-hybrid $as_me TRUNK, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15159,7 +15110,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ircd-hybrid config.status 8beta2 +ircd-hybrid config.status TRUNK configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15569,8 +15520,6 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; - "contrib/help/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/help/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;; "messages/Makefile") CONFIG_FILES="$CONFIG_FILES messages/Makefile" ;; @@ -16177,7 +16126,7 @@ $as_echo "$as_me: executing $ac_file com case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in