From d8c4154da2854bcd6fd62832a2fae73915843532 Mon Sep 17 00:00:00 2001 From: Aaron Jones Date: Thu, 7 Jan 2016 17:15:55 +0000 Subject: [PATCH] Fix LTDL conditional, remove some unnecessary and/or ugly configure tests --- .gitignore | 2 + Makefile.in | 1 - authd/Makefile.in | 1 - bandb/Makefile.in | 1 - configure | 401 +---------------------------------------- configure.ac | 216 +--------------------- doc/Makefile.in | 1 - extensions/Makefile.in | 1 - help/Makefile.in | 1 - include/m_info.h | 2 - include/setup.h.in | 24 --- ircd/Makefile.in | 1 - libltdl/Makefile.in | 2 +- modules/Makefile.in | 1 - ssld/Makefile.in | 1 - tools/Makefile.in | 1 - 16 files changed, 8 insertions(+), 649 deletions(-) diff --git a/.gitignore b/.gitignore index 9d5924b2..844fe7ab 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ Makefile *.log *.sw? .deps +.dirstamp .libs autom4te.cache bandb/bandb @@ -39,3 +40,4 @@ tools/viconf include/serno.h ircd/version.c ircd/version.c.last +/libtool diff --git a/Makefile.in b/Makefile.in index 0c0ab0b7..315d8600 100644 --- a/Makefile.in +++ b/Makefile.in @@ -319,7 +319,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/authd/Makefile.in b/authd/Makefile.in index 94e77776..bf27a7b6 100644 --- a/authd/Makefile.in +++ b/authd/Makefile.in @@ -277,7 +277,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/bandb/Makefile.in b/bandb/Makefile.in index 48c6666e..810f7682 100644 --- a/bandb/Makefile.in +++ b/bandb/Makefile.in @@ -282,7 +282,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/configure b/configure index 34da2ad9..904769c6 100755 --- a/configure +++ b/configure @@ -648,7 +648,6 @@ SSL_INCLUDES SSL_SRCS_ENABLE MOD_TARGET MODULES_LIBS -SELECT_TYPE PROGRAM_PREFIX PKGRUNDIR moduledir @@ -843,11 +842,6 @@ enable_openssl with_zlib_path enable_zlib with_shared_sqlite -enable_ports -enable_poll -enable_select -enable_kqueue -enable_epoll with_confdir with_logdir with_helpdir @@ -1518,11 +1512,6 @@ 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. - --enable-epoll Force sys_epoll usage (Linux only). --enable-assert Enable assert(). Choose between soft(warnings) and hard(aborts the daemon) --enable-iodebug Enable IO Debugging hooks @@ -13469,7 +13458,10 @@ eval "LTDLOPEN=\"$libname_spec\"" build_ltdl=$with_included_ltdl if test x"$build_ltdl" = x"yes"; then - if 1; then + subdirs="$subdirs libltdl" + +fi + if test x"$build_ltdl" = x"yes"; then BUILD_LTDL_TRUE= BUILD_LTDL_FALSE='#' else @@ -13477,9 +13469,6 @@ else BUILD_LTDL_FALSE= fi - subdirs="$subdirs libltdl" - -fi if test "$ac_cv_c_compiler_gnu" = yes; then IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall" @@ -15098,34 +15087,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5 -$as_echo_n "checking whether string.h and strings.h may both be included... " >&6; } -if ${gcc_cv_header_string+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_header_string=yes -else - gcc_cv_header_string=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_string" >&5 -$as_echo "$gcc_cv_header_string" >&6; } - -if test "$gcc_cv_header_string" = "yes"; then - -$as_echo "#define STRING_WITH_STRINGS 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } if ${ac_cv_c_bigendian+:} false; then : @@ -15359,79 +15320,6 @@ else fi - - -if test "$ac_cv_c_compiler_gnu" = yes; then - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strlcpy" >&5 -$as_echo_n "checking for strlcpy... " >&6; } -save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -Wimplicit -Werror" - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -int -main () -{ -char *a = malloc(6); - strlcpy(a, "hello", 6); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_STRLCPY 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strlcat" >&5 -$as_echo_n "checking for strlcat... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -int -main () -{ -char *a = malloc(6); - a[0] = '\0'; - strlcat(a, "hello", 6); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_STRLCAT 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -CFLAGS=$save_CFLAGS - -else - - for ac_func in strlcat strlcpy do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -15445,8 +15333,6 @@ fi done -fi - ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default" if test "x$ac_cv_type_u_int32_t" = xyes; then : @@ -16279,75 +16165,6 @@ SQLITE_INCLUDES="$SQLITE_CFLAGS" -# 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 - SELECT_TYPE_EXPLICIT="poll" - else - use_poll=no - fi - -fi - - -# Check whether --enable-select was given. -if test "${enable_select+set}" = set; then : - enableval=$enable_select; if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="select" - else - use_select=no - fi - -fi - - -# Check whether --enable-kqueue was given. -if test "${enable_kqueue+set}" = set; then : - enableval=$enable_kqueue; if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="kqueue" - else - use_kqueue=no - fi - -fi - - -# Check whether --enable-epoll was given. -if test "${enable_epoll+set}" = set; then : - enableval=$enable_epoll; if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="epoll" - for ac_func in epoll_ctl -do : - ac_fn_c_check_func "$LINENO" "epoll_ctl" "ac_cv_func_epoll_ctl" -if test "x$ac_cv_func_epoll_ctl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EPOLL_CTL 1 -_ACEOF - haveepoll=yes -else - haveepoll=no -fi -done - - else - use_epoll=no - fi - -fi - - - # Check whether --with-confdir was given. if test "${with_confdir+set}" = set; then : @@ -16651,215 +16468,6 @@ $as_echo "#define CUSTOM_BRANDING 1" >>confdefs.h fi -if test ! -z "$SELECT_TYPE_EXPLICIT"; then - SELECT_TYPE="$SELECT_TYPE_EXPLICIT"; - echo "Forcing $SELECT_TYPE to be enabled" -else - -if test ! "x$use_ports" = "xno"; then - for ac_func in port_getn -do : - ac_fn_c_check_func "$LINENO" "port_getn" "ac_cv_func_port_getn" -if test "x$ac_cv_func_port_getn" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_PORT_GETN 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 -do : - ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" -if test "x$ac_cv_func_select" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SELECT 1 -_ACEOF - haveselect=yes -else - haveselect=no -fi -done - - if test "x$haveselect" = "xyes" ; then - SELECT_TYPE="select" - fi -fi - -if test ! "x$use_poll" = "xno"; then - for ac_func in poll -do : - ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -if test "x$ac_cv_func_poll" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_POLL 1 -_ACEOF - havepoll=yes -else - havepoll=no -fi -done - - if test "x$havepoll" = "xyes" ; then - SELECT_TYPE="poll" - fi -fi - -if test ! "x$use_kqueue" = "xno"; then - for ac_func in kevent -do : - ac_fn_c_check_func "$LINENO" "kevent" "ac_cv_func_kevent" -if test "x$ac_cv_func_kevent" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_KEVENT 1 -_ACEOF - havekqueue=yes -else - havekqueue=no -fi -done - - if test "x$havekqueue" = "xyes" ; then - SELECT_TYPE="kqueue" - fi -fi - -if test ! "x$use_epoll" = "xno"; then - for ac_func in epoll_ctl -do : - ac_fn_c_check_func "$LINENO" "epoll_ctl" "ac_cv_func_epoll_ctl" -if test "x$ac_cv_func_epoll_ctl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EPOLL_CTL 1 -_ACEOF - haveepoll=yes -else - haveepoll=no -fi -done - - if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then - if test "x$haveepoll" = "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll support in kernel" >&5 -$as_echo_n "checking for epoll support in kernel... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -#include -#include - -int -main(int argc, char **argv) -{ - int epfd; - - epfd = epoll_create(256); - return (epfd == -1 ? 1 : 0); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_EPOLL 1" >>confdefs.h - - SELECT_TYPE="epoll" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - fi - -haveepollsyscall=no - -if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then - if test "x$haveepoll" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll system call" >&5 -$as_echo_n "checking for epoll system call... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -#include -#include - -int -epoll_create(int size) -{ - return (syscall(__NR_epoll_create, size)); -} - -int -main(int argc, char **argv) -{ - int epfd; - - epfd = epoll_create(256); - exit (epfd == -1 ? 1 : 0); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_EPOLL 1" >>confdefs.h - - SELECT_TYPE="epoll" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi -fi - -fi - -fi - -if test -z "$SELECT_TYPE"; then - as_fn_error $? "Unable to find a usable IO interface" "$LINENO" 5 -fi - -echo "Using $SELECT_TYPE for select loop." - - -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE "$SELECT_TYPE" -_ACEOF - - - - # Check whether --enable-assert was given. if test "${enable_assert+set}" = set; then : @@ -20775,7 +20383,6 @@ Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}: Ziplinks : $zlib OpenSSL : $openssl - Socket Engine : $SELECT_TYPE Small network : $small_net Block allocator : $balloc diff --git a/configure.ac b/configure.ac index 24fc5406..944f06f6 100644 --- a/configure.ac +++ b/configure.ac @@ -28,9 +28,9 @@ LTDL_INIT build_ltdl=$with_included_ltdl if test x"$build_ltdl" = x"yes"; then - AM_CONDITIONAL([BUILD_LTDL], [1]) AC_CONFIG_SUBDIRS([libltdl]) fi +AM_CONDITIONAL([BUILD_LTDL], [test x"$build_ltdl" = x"yes"]) if test "$ac_cv_c_compiler_gnu" = yes; then IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall" @@ -178,72 +178,12 @@ fi AC_SUBST(VICONF) -dnl See whether we can include both string.h and strings.h. -AC_CACHE_CHECK([whether string.h and strings.h may both be included], -gcc_cv_header_string, -[ - AC_COMPILE_IFELSE( - [#include - #include ], - [gcc_cv_header_string=yes], - [gcc_cv_header_string=no]) -]) - -if test "$gcc_cv_header_string" = "yes"; then - AC_DEFINE(STRING_WITH_STRINGS, 1, [Define to 1 if string.h may be included along with strings.h]) -fi - AC_C_BIGENDIAN dnl Check for stdarg.h - if we can't find it, halt configure AC_CHECK_HEADER(stdarg.h, , [AC_MSG_ERROR([** stdarg.h could not be found - charybdis will not compile without it **])]) - -dnl Checks for the existence of strlcat, strlcpy, basename... -dnl This more reliable test only works with gcc though. - -if test "$ac_cv_c_compiler_gnu" = yes; then - -AC_MSG_CHECKING(for strlcpy) -save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -Wimplicit -Werror" - -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #include ]], - [[char *a = malloc(6); - strlcpy(a, "hello", 6);]] - )], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRLCPY, 1, [Define if strlcpy is available (most BSDs.)])], - [AC_MSG_RESULT(no)] -) - -AC_MSG_CHECKING(for strlcat) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #include ]], - [[char *a = malloc(6); - a[0] = '\0'; - strlcat(a, "hello", 6);]] - )], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRLCAT, 1, [Define if strlcat is available (most BSDs.)])], - [AC_MSG_RESULT(no)] -) - -CFLAGS=$save_CFLAGS - -else - -dnl Better than nothing. The more complicated test above probably fixes powerpc, -dnl so who cares. - AC_CHECK_FUNCS([strlcat strlcpy]) -fi - AC_CHECK_TYPE([u_int32_t], [], [ AC_CHECK_TYPE([uint32_t], @@ -445,50 +385,6 @@ AC_SUBST(SQLITE_LD, "$SQLITE_LIBS") AC_SUBST(SQLITE_INCLUDES, "$SQLITE_CFLAGS") AC_SUBST(SQLITE_OBJ) -dnl IO Loop Selection -dnl ================= - -AC_ARG_ENABLE(ports, AC_HELP_STRING([--enable-ports],[Force solaris I/O ports subsystem usage.]), -[ if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="ports" - else - use_ports=no - fi -],) - -AC_ARG_ENABLE(poll, AC_HELP_STRING([--enable-poll],[Force poll() usage.]), -[ if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="poll" - else - use_poll=no - fi -],) - -AC_ARG_ENABLE(select, AC_HELP_STRING([--enable-select],[Force select() usage.]), -[ if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="select" - else - use_select=no - fi -],) - -AC_ARG_ENABLE(kqueue, AC_HELP_STRING([--enable-kqueue],[Force kqueue() usage.]), -[ if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="kqueue" - else - use_kqueue=no - fi -],) - -AC_ARG_ENABLE(epoll, AC_HELP_STRING([--enable-epoll],[Force sys_epoll usage (Linux only).]), -[ if test $enableval = yes; then - SELECT_TYPE_EXPLICIT="epoll" - AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], [haveepoll=no]) - else - use_epoll=no - fi -],) - dnl ********************************************************************** dnl Check for --with-confdir [deprecated, use --sysconfdir instead] dnl ********************************************************************** @@ -610,115 +506,6 @@ if test "x$BRANDING_NAME" != "x$PACKAGE_NAME"; then AC_DEFINE(CUSTOM_BRANDING, 1, [Define if custom branding is enabled.]) fi -if test ! -z "$SELECT_TYPE_EXPLICIT"; then - SELECT_TYPE="$SELECT_TYPE_EXPLICIT"; - echo "Forcing $SELECT_TYPE to be enabled" -else - -if test ! "x$use_ports" = "xno"; then - AC_CHECK_FUNCS(port_getn, [haveports=yes], [haveports=no]) - if test "x$haveports" = "xyes" ; then - SELECT_TYPE="ports" - fi -fi - -if test ! "x$use_select" = "xno"; then - AC_CHECK_FUNCS(select, [haveselect=yes], [haveselect=no]) - if test "x$haveselect" = "xyes" ; then - SELECT_TYPE="select" - fi -fi - -if test ! "x$use_poll" = "xno"; then - AC_CHECK_FUNCS(poll, [havepoll=yes], [havepoll=no]) - if test "x$havepoll" = "xyes" ; then - SELECT_TYPE="poll" - fi -fi - -if test ! "x$use_kqueue" = "xno"; then - AC_CHECK_FUNCS(kevent, [havekqueue=yes], [havekqueue=no]) - if test "x$havekqueue" = "xyes" ; then - SELECT_TYPE="kqueue" - fi -fi - -if test ! "x$use_epoll" = "xno"; then - AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], [haveepoll=no]) - if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then - if test "x$haveepoll" = "xyes" ; then - AC_MSG_CHECKING(for epoll support in kernel) - AC_TRY_RUN( -#include -#include -#include -#include -#include -#include - -int -main(int argc, char **argv) -{ - int epfd; - - epfd = epoll_create(256); - return (epfd == -1 ? 1 : 0); -}, [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_EPOLL, 1, - [Define if your system supports the epoll system calls]) - SELECT_TYPE="epoll"], - AC_MSG_RESULT(no), AC_MSG_RESULT(no)) - fi - fi - -haveepollsyscall=no - -if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then - if test "x$haveepoll" = "xno" ; then - AC_MSG_CHECKING(for epoll system call) - AC_TRY_RUN( -#include -#include -#include -#include -#include -#include - -int -epoll_create(int size) -{ - return (syscall(__NR_epoll_create, size)); -} - -int -main(int argc, char **argv) -{ - int epfd; - - epfd = epoll_create(256); - exit (epfd == -1 ? 1 : 0); -}, [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_EPOLL, 1, - [Define if your system supports the epoll system calls]) - SELECT_TYPE="epoll"], - AC_MSG_RESULT(no), AC_MSG_RESULT(no)) - fi -fi - -fi - -fi - -if test -z "$SELECT_TYPE"; then - AC_MSG_ERROR([Unable to find a usable IO interface],) -fi - -echo "Using $SELECT_TYPE for select loop." - -AC_DEFINE_UNQUOTED(SELECT_TYPE, "$SELECT_TYPE", [This is the type of IO loop we are using]) -AC_SUBST(SELECT_TYPE) - - dnl Debug-related options dnl ===================== @@ -949,7 +736,6 @@ Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}: Ziplinks : $zlib OpenSSL : $openssl - Socket Engine : $SELECT_TYPE Small network : $small_net Block allocator : $balloc diff --git a/doc/Makefile.in b/doc/Makefile.in index c53aad79..af2d020e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -224,7 +224,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/extensions/Makefile.in b/extensions/Makefile.in index 20e4411f..b8de33c5 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -506,7 +506,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/help/Makefile.in b/help/Makefile.in index e21da3a7..ddeb851b 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -228,7 +228,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/include/m_info.h b/include/m_info.h index fd255573..46f2f077 100644 --- a/include/m_info.h +++ b/include/m_info.h @@ -134,8 +134,6 @@ Info MyInformation[] = { {"PPATH", "NONE", 0, "Path to Pid File"}, #endif /* PPATH */ - {"SELECT_TYPE", SELECT_TYPE, 0, "Method of Multiplexed I/O"}, - #ifdef SPATH {"SPATH", SPATH, 0, "Path to Server Executable"}, #else diff --git a/include/setup.h.in b/include/setup.h.in index 701eeefb..45026e61 100644 --- a/include/setup.h.in +++ b/include/setup.h.in @@ -109,12 +109,6 @@ /* Define if you have the _dyld_func_lookup function. */ #undef HAVE_DYLD -/* Define if your system supports the epoll system calls */ -#undef HAVE_EPOLL - -/* Define to 1 if you have the `epoll_ctl' function. */ -#undef HAVE_EPOLL_CTL - /* Define to 1 if you have the header file. */ #undef HAVE_ERRNO_H @@ -127,9 +121,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `kevent' function. */ -#undef HAVE_KEVENT - /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO @@ -163,21 +154,12 @@ /* Define to 1 if you have the `opendir' function. */ #undef HAVE_OPENDIR -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - -/* Define to 1 if you have the `port_getn' function. */ -#undef HAVE_PORT_GETN - /* Define if libtool can extract symbol lists from object files. */ #undef HAVE_PRELOADED_SYMBOLS /* Define to 1 if you have the `readdir' function. */ #undef HAVE_READDIR -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - /* Define if you have the shl_load function. */ #undef HAVE_SHL_LOAD @@ -360,9 +342,6 @@ /* String with which all programs intended to be in PATH are prefixed. */ #undef PROGRAM_PREFIX -/* This is the type of IO loop we are using */ -#undef SELECT_TYPE - /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT @@ -389,9 +368,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to 1 if string.h may be included along with strings.h */ -#undef STRING_WITH_STRINGS - /* Maximum topic length (<=390) */ #undef TOPICLEN diff --git a/ircd/Makefile.in b/ircd/Makefile.in index 617a84c3..b483d300 100644 --- a/ircd/Makefile.in +++ b/ircd/Makefile.in @@ -342,7 +342,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in index 17b7d41a..0734a698 100644 --- a/libltdl/Makefile.in +++ b/libltdl/Makefile.in @@ -87,7 +87,7 @@ host_triplet = @host@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config-h.in lt__strl.c argz.c lt__dirent.c \ + $(srcdir)/config-h.in lt__dirent.c lt__strl.c argz.c \ $(top_srcdir)/config/depcomp $(am__include_HEADERS_DIST) \ $(am__ltdlinclude_HEADERS_DIST) COPYING.LIB README \ config/ar-lib config/compile config/config.guess \ diff --git a/modules/Makefile.in b/modules/Makefile.in index b7570d0f..526d064e 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -572,7 +572,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/ssld/Makefile.in b/ssld/Makefile.in index b62d0b98..1255f920 100644 --- a/ssld/Makefile.in +++ b/ssld/Makefile.in @@ -276,7 +276,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 02fd2bf8..10b9038a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -276,7 +276,6 @@ RANLIB = @RANLIB@ RM = @RM@ SED = @SED@ SEDOBJ = @SEDOBJ@ -SELECT_TYPE = @SELECT_TYPE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE_CFLAGS = @SQLITE_CFLAGS@