From c1c5fdc4b64189ecee3d10bb8466b8ee44909b11 Mon Sep 17 00:00:00 2001 From: nenolod Date: Sun, 6 May 2007 19:57:50 -0700 Subject: [PATCH] [svn] - regen configure --- ChangeLog | 9 ++++ configure | 119 ++++++++++++++++++++++++++++++++++++++++++++++-- include/serno.h | 2 +- 3 files changed, 126 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66c8585..dce572a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +nenolod 2007/05/07 02:53:54 UTC (20070507-3440) + Log: + - remove "ASM hashing code" from the configure overview + + + Changes: Modified: + +0 -1 trunk/configure.ac (File Modified) + + jilles 2007/05/06 14:46:45 UTC (20070506-3438) Log: Target left IRC (more friendly error message if a UID diff --git a/configure b/configure index 42cabc4..c6f6c59 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for charybdis 2.2.0. # -# $Id: configure 3364 2007-04-03 09:50:56Z nenolod $ +# $Id: configure 3442 2007-05-07 02:57:50Z nenolod $ # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1293,6 +1293,7 @@ Optional Features: --enable-openssl=DIR Enable OpenSSL support (DIR optional). --disable-openssl Disable OpenSSL support. --disable-zlib Disable ziplinks support + --enable-ports Force solaris I/O ports subsystem usage. --enable-poll Force poll() usage. --enable-select Force select() usage. --enable-kqueue Force kqueue() usage. @@ -1405,7 +1406,7 @@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -$Id: configure 3364 2007-04-03 09:50:56Z nenolod $ +$Id: configure 3442 2007-05-07 02:57:50Z nenolod $ _ACEOF exit fi @@ -9755,6 +9756,17 @@ fi fi +# Check whether --enable-ports was given. +if test "${enable_ports+set}" = set; then + enableval=$enable_ports; if test $enableval = yes; then + SELECT_TYPE_EXPLICIT="ports" + else + use_ports=no + fi + +fi + + # Check whether --enable-poll was given. if test "${enable_poll+set}" = set; then enableval=$enable_poll; if test $enableval = yes; then @@ -10144,6 +10156,108 @@ if test ! -z "$SELECT_TYPE_EXPLICIT"; then echo "Forcing $SELECT_TYPE to be enabled" else +if test ! "x$use_ports" = "xno"; then + +for ac_func in port_getn +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + haveports=yes +else + haveports=no +fi +done + + if test "x$haveports" = "xyes" ; then + SELECT_TYPE="ports" + fi +fi + if test ! "x$use_select" = "xno"; then for ac_func in select @@ -15236,7 +15350,6 @@ Configuration: Socket Engine : $SELECT_TYPE Small network : $small_net Block allocator : $balloc - ASM hashing code : $ricer_hashing Nickname length : $NICKLEN Topic length : $TOPICLEN diff --git a/include/serno.h b/include/serno.h index f826fec..e14c164 100644 --- a/include/serno.h +++ b/include/serno.h @@ -1 +1 @@ -#define SERNO "20070506-3438" +#define SERNO "20070507-3440"