X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=9bda36e6cb7af236a433400dd10f0aa37dadbed5;hp=eefefd7cd98e06f73282fb61c0a960633dd5bacd;hb=e5097bf2e66791c02334a6712d69c9ba424d7dba;hpb=9dfcc6504ee6b5105e2e09c130dae7a1f015d9e9 diff --git a/configure.in b/configure.in index eefefd7c..9bda36e6 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.108 2005/03/21 22:15:15 alex Exp $ +# $Id: configure.in,v 1.115 2005/07/22 21:02:22 alex Exp $ # # -- Initialisation -- @@ -30,7 +30,7 @@ AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging]) AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used]) AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used]) -AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included]) +AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included]) AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests]) AH_TEMPLATE([TARGET_OS], [Target operating system name]) @@ -91,8 +91,8 @@ AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h]) AC_MSG_CHECKING(whether socklen_t exists) AC_TRY_COMPILE([ -#include #include +#include ],[ socklen_t a, b; a = 2; b = 4; a += b; @@ -121,7 +121,7 @@ AC_CHECK_FUNCS([ \ memset realloc setsid setsockopt socket strcasecmp strchr strerror \ strstr waitpid],,AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strlcpy strlcat) +AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat) AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)], AC_MSG_ERROR([required function select() is missing!]) @@ -178,6 +178,45 @@ if test "$x_zlib_on" = "yes"; then AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!])) fi + +x_io_backend=select +AC_ARG_WITH(epoll, + [ --without-epoll disable epoll support (autodetected by default)], + [ if test "$withval" != "no"; then + if test "$withval" != "yes"; then + CFLAGS="-I$withval/include $CFLAGS" + CPPFLAGS="-I$withval/include $CPPFLAGS" + LDFLAGS="-L$withval/lib $LDFLAGS" + fi + AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll, + AC_MSG_ERROR([Can't enable epoll support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(epoll_create, x_io_backend=epoll) + ] +) + +AC_ARG_WITH(kqueue, + [ --without-kqueue disable kqueue support (autodetected by default)], + [ if test "$withval" != "no"; then + if test "$withval" != "yes"; then + CFLAGS="-I$withval/include $CFLAGS" + CPPFLAGS="-I$withval/include $CPPFLAGS" + LDFLAGS="-L$withval/lib $LDFLAGS" + fi + AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue, + AC_MSG_ERROR([Can't enable kqueue support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue) + ] +) + + x_tcpwrap_on=no AC_ARG_WITH(tcp-wrappers, [ --with-tcp-wrappers enable TCP wrappers support], @@ -207,32 +246,32 @@ int deny_severity = 0; ] ) -x_rendezvous_on=no -AC_ARG_WITH(rendezvous, - [ --with-rendezvous enable support for "Rendezvous"], +x_zeroconf_on=no +AC_ARG_WITH(zeroconf, + [ --with-zeroconf enable support for "Zeroconf"], [ if test "$withval" != "no"; then if test "$withval" != "yes"; then CFLAGS="-I$withval/include $CFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS" fi - AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=osx, + AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_zeroconf_on=osx, [ AC_CHECK_LIB(pthread, pthread_mutexattr_init) AC_CHECK_LIB(howl, sw_discovery_init) AC_CHECK_FUNCS(sw_discovery_init, \ - x_rendezvous_on=howl, \ - AC_MSG_ERROR([Can't enable Rendezvous!])) + x_zeroconf_on=howl, \ + AC_MSG_ERROR([Can't enable Zeroconf!])) ]) fi ] ) -if test "$x_rendezvous_on" = "osx"; then +if test "$x_zeroconf_on" = "osx"; then AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \ mach/port.h],,AC_MSG_ERROR([required C header missing!])) - AC_DEFINE(RENDEZVOUS, 1) + AC_DEFINE(ZEROCONF, 1) fi -if test "$x_rendezvous_on" = "howl"; then +if test "$x_zeroconf_on" = "howl"; then for dir in /usr/local/include /usr/local/include/howl* \ /usr/include /usr/include/howl*; do test -d "$dir" || continue @@ -251,7 +290,7 @@ if test "$x_rendezvous_on" = "howl"; then done AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \ AC_MSG_ERROR([required C header missing!])) - AC_DEFINE(RENDEZVOUS, 1) + AC_DEFINE(ZEROCONF, 1) fi x_identauth_on=no @@ -326,6 +365,7 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" AC_OUTPUT([ \ Makefile \ doc/Makefile \ + doc/src/Makefile \ src/Makefile \ src/portab/Makefile \ src/tool/Makefile \ @@ -348,7 +388,7 @@ fi # -- Result -- echo -echo "ngIRCd has been configured with the following options:" +echo "ngIRCd $PACKAGE_VERSION has been configured with the following options:" echo # Someone please show me a better way :) [borrowed by OpenSSH] @@ -374,8 +414,8 @@ echo echo $ECHO_N " Syslog support: $ECHO_C" test "$x_syslog_on" = "yes" \ - && echo $ECHO_N "yes $ECHO_C" \ - || echo $ECHO_N "no $ECHO_C" + && echo $ECHO_N "yes $ECHO_C" \ + || echo $ECHO_N "no $ECHO_C" echo $ECHO_N " Enable debug code: $ECHO_C" test "$x_debug_on" = "yes" \ && echo "yes" \ @@ -383,8 +423,8 @@ test "$x_debug_on" = "yes" \ echo $ECHO_N " zlib compression: $ECHO_C" test "$x_zlib_on" = "yes" \ - && echo $ECHO_N "yes $ECHO_C" \ - || echo $ECHO_N "no $ECHO_C" + && echo $ECHO_N "yes $ECHO_C" \ + || echo $ECHO_N "no $ECHO_C" echo $ECHO_N " IRC sniffer: $ECHO_C" test "$x_sniffer_on" = "yes" \ && echo "yes" \ @@ -392,17 +432,25 @@ test "$x_sniffer_on" = "yes" \ echo $ECHO_N " Use TCP Wrappers: $ECHO_C" test "$x_tcpwrap_on" = "yes" \ - && echo $ECHO_N "yes $ECHO_C" \ - || echo $ECHO_N "no $ECHO_C" + && echo $ECHO_N "yes $ECHO_C" \ + || echo $ECHO_N "no $ECHO_C" echo $ECHO_N " Strict RFC mode: $ECHO_C" test "$x_strict_rfc_on" = "yes" \ && echo "yes" \ || echo "no" -echo $ECHO_N " Rendezvous support: $ECHO_C" -test "$x_rendezvous_on" = "osx" -o "$x_rendezvous_on" = "howl" \ - && echo $ECHO_N "yes $ECHO_C" \ - || echo $ECHO_N "no $ECHO_C" +echo $ECHO_N " Zeroconf support: $ECHO_C" +case "$x_zeroconf_on" in + osx) + echo $ECHO_N "Apple $ECHO_C" + ;; + howl) + echo $ECHO_N "Howl $ECHO_C" + ;; + *) + echo $ECHO_N "no $ECHO_C" + ;; +esac echo $ECHO_N " IRC+ protocol: $ECHO_C" test "$x_ircplus_on" = "yes" \ && echo "yes" \ @@ -410,9 +458,11 @@ test "$x_ircplus_on" = "yes" \ echo $ECHO_N " IDENT support: $ECHO_C" test "$x_identauth_on" = "yes" \ - && echo $ECHO_N "yes $ECHO_C" \ - || echo $ECHO_N "no $ECHO_C" + && echo $ECHO_N "yes $ECHO_C" \ + || echo $ECHO_N "no $ECHO_C" +echo $ECHO_N " I/O backend: $ECHO_C" + echo "$x_io_backend" -echo; echo +echo # -eof-