X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=61bf08e939333b6f5b1c1165d516ead18fb23882;hp=49d2debe62218b397b6e0075e032f07e85a11171;hb=ffc5f93ef543189626e0e4e269f125aea15a5053;hpb=558fe6b453a08c8924060b02d66f32a3683cc821 diff --git a/configure.in b/configure.in index 49d2debe..61bf08e9 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2004 Alexander Barton +# Copyright (c)2001-2008 Alexander Barton # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -8,13 +8,11 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.102 2004/04/11 13:20:24 alex Exp $ -# # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, CVSHEAD) +AC_INIT(ngircd, dev) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) @@ -30,7 +28,8 @@ 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([WANT_IPV6], [Define if IPV6 protocol should be enabled]) +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]) @@ -53,12 +52,31 @@ AC_PROG_RANLIB AM_C_PROTOTYPES AC_C_CONST +AC_C_INLINE # -- Hard coded system and compiler dependencies/features/options ... -- +AC_DEFUN([GCC_STACK_PROTECT_CC],[ + ssp_cc=yes + # we use -fstack-protector-all for the test to enfoce the use of the guard variable + AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector]) + ssp_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fstack-protector-all" + AC_TRY_LINK(,,, ssp_cc=no) + echo $ssp_cc + CFLAGS="$ssp_old_cflags" + if test "X$ssp_cc" = "Xyes"; then + CFLAGS="$CFLAGS -fstack-protector" + AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) + fi +]) + + if test "$GCC" = "yes"; then # We are using the GNU C compiler. Good! CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes" + + GCC_STACK_PROTECT_CC fi case "$target_os" in @@ -85,14 +103,14 @@ AC_CHECK_HEADERS([ \ strings.h sys/socket.h sys/time.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) -AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdint.h varargs.h]) +AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h]) # -- Datatypes -- AC_MSG_CHECKING(whether socklen_t exists) AC_TRY_COMPILE([ - #include - #include +#include +#include ],[ socklen_t a, b; a = 2; b = 4; a += b; @@ -105,6 +123,7 @@ AC_TRY_COMPILE([ AC_TYPE_SIGNAL AC_TYPE_SIZE_T + # -- Libraries -- AC_CHECK_LIB(UTIL,memmove) @@ -117,22 +136,24 @@ AC_FUNC_FORK AC_FUNC_STRFTIME AC_CHECK_FUNCS([ \ - bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \ - memset realloc setsid setsockopt socket strcasecmp strchr strerror \ - strstr waitpid],,AC_MSG_ERROR([required function missing!])) + bind gethostbyaddr gethostbyname gethostname inet_ntoa \ + setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strlcpy strlcat) - -AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)], - AC_MSG_ERROR([required function select() is missing!]) -) +AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat strtok_r) # -- Configuration options -- +# use syslog? + x_syslog_on=no AC_ARG_WITH(syslog, [ --without-syslog disable syslog (autodetected by default)], - [ if test "$withval" = "yes"; then + [ 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_LIB(be, syslog) AC_CHECK_FUNCS(syslog, x_syslog_on=yes, AC_MSG_ERROR([Can't enable syslog!]) @@ -146,13 +167,20 @@ AC_ARG_WITH(syslog, ) if test "$x_syslog_on" = "yes"; then AC_DEFINE(SYSLOG, 1) - AC_CHECK_HEADERS(syslog.h) + AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!])) fi +# use zlib compression? + x_zlib_on=no AC_ARG_WITH(zlib, [ --without-zlib disable zlib compression (autodetected by default)], - [ if test "$withval" = "yes"; then + [ 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_LIB(z, deflate) AC_CHECK_FUNCS(deflate, x_zlib_on=yes, AC_MSG_ERROR([Can't enable zlib!]) @@ -165,20 +193,187 @@ AC_ARG_WITH(zlib, ) if test "$x_zlib_on" = "yes"; then AC_DEFINE(ZLIB, 1) - AC_CHECK_HEADERS(zlib.h) + AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!])) fi +# detect which IO API to use: + +x_io_backend=none + +AC_ARG_WITH(select, + [ --without-select disable select IO 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(select, x_io_select=yes, + AC_MSG_ERROR([Can't enable select IO support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(select, x_io_select=yes) + ] +) + +AC_ARG_WITH(poll, + [ --without-poll disable poll 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(poll, x_io_backend=poll\(\), + AC_MSG_ERROR([Can't enable poll IO support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(poll, x_io_backend=poll\(\)) + ] +) + +AC_ARG_WITH(devpoll, + [ --without-devpoll disable /dev/poll IO 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_HEADERS(sys/devpoll.h,,AC_MSG_ERROR([required C header missing!])) + fi + ], + [ + AC_CHECK_HEADERS(sys/devpoll.h, x_io_backend=/dev/poll) + ] +) + +AC_ARG_WITH(epoll, + [ --without-epoll disable epoll IO 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_epoll=yes, + AC_MSG_ERROR([Can't enable epoll IO support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes) + ] +) + +AC_ARG_WITH(kqueue, + [ --without-kqueue disable kqueue IO 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 IO support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(kqueue, x_io_backend=kqueue\(\)) + ] +) + +if test "$x_io_epoll" = "yes" -a "$x_io_select" = "yes"; then + # when epoll() and select() are available, we'll use both! + x_io_backend="epoll(), select()" +else + if test "$x_io_epoll" = "yes"; then + # we prefere epoll() if it is available + x_io_backend="epoll()" + else + if test "$x_io_select" = "yes" -a "$x_io_backend" = "none"; then + # we'll use select, when available and no "better" + # interface has been detected ... + x_io_backend="select()" + fi + fi +fi + +if test "$x_io_backend" = "none"; then + AC_MSG_ERROR([No useabe IO API activated/found!?]) +fi + +# use SSL? + +AC_ARG_WITH(openssl, + [ --with-openssl enable SSL support using OpenSSL], + [ if test "$withval" = "yes"; then + if test "$withval" != "yes"; then + CFLAGS="-I$withval/include $CFLAGS" + CPPFLAGS="-I$withval/include $CPPFLAGS" + LDFLAGS="-L$withval/lib $LDFLAGS" + fi + AC_CHECK_LIB(crypto, BIO_s_mem) + AC_CHECK_LIB(ssl, SSL_library_init) + AC_CHECK_FUNCS(SSL_library_init, x_ssl_openssl=yes, + AC_MSG_ERROR([Can't enable openssl]) + ) + fi + ] +) + +AC_ARG_WITH(gnutls, + [ --with-gnutls enable SSL support using gnutls], + [ if test "$withval" = "yes"; then + if test "$withval" != "yes"; then + CFLAGS="-I$withval/include $CFLAGS" + CPPFLAGS="-I$withval/include $CPPFLAGS" + LDFLAGS="-L$withval/lib $LDFLAGS" + fi + AC_CHECK_LIB(gnutls, gnutls_global_init) + AC_CHECK_FUNCS(gnutls_global_init, x_ssl_gnutls=yes, + AC_MSG_ERROR([Can't enable gnutls]) + ) + fi + ] +) + +x_ssl_lib="no" +if test "$x_ssl_gnutls" = "yes"; then + if test "$x_ssl_openssl" = "yes";then + AC_MSG_ERROR([Cannot enable both gnutls and openssl]) + fi + x_ssl_lib=gnutls +fi +if test "$x_ssl_openssl" = "yes"; then + x_ssl_lib=openssl +fi + +# use TCP wrappers? + x_tcpwrap_on=no AC_ARG_WITH(tcp-wrappers, [ --with-tcp-wrappers enable TCP wrappers support], - [ if test "$withval" = "yes"; then - AC_CHECK_LIB(wrap, tcpd_warn) + [ 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_MSG_CHECKING(for hosts_access) + LIBS="-lwrap $LIBS" AC_TRY_LINK([ - #include +#include +int allow_severity = 0; +int deny_severity = 0; ],[ - void *ptr; - ptr = hosts_access; + tcpd_warn("link test"); ],[ AC_MSG_RESULT(yes) AC_DEFINE(TCPWRAP, 1) @@ -191,25 +386,67 @@ AC_ARG_WITH(tcp-wrappers, ] ) -x_rendezvous_on=no -AC_ARG_WITH(rendezvous, - [ --with-rendezvous enable support for "Rendezvous"], - [ if test "$withval" = "yes"; then - AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=yes, - AC_MSG_ERROR([Can't enable Rendezvous!]) - ) +# include support for "zeroconf"? + +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_zeroconf_on=osx, + [ + AC_CHECK_LIB(pthread, pthread_mutexattr_init) + AC_CHECK_LIB(howl, sw_discovery_init) + AC_CHECK_FUNCS(sw_discovery_init, \ + x_zeroconf_on=howl, \ + AC_MSG_ERROR([Can't enable Zeroconf!])) + ]) fi ] ) -if test "$x_rendezvous_on" = "yes"; then - AC_DEFINE(RENDEZVOUS, 1) - AC_CHECK_HEADERS(DNSServiceDiscovery/DNSServiceDiscovery.h mach/port.h) +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(ZEROCONF, 1) +fi +if test "$x_zeroconf_on" = "howl"; then + for dir in /usr/local/include /usr/local/include/howl* \ + /usr/include /usr/include/howl* \ + /usr/local/include/avahi* /usr/include/avahi*; do + test -d "$dir" || continue + AC_MSG_CHECKING([for Howl headers in $dir]) + if test -f "$dir/rendezvous/rendezvous.h"; then + if test "$dir" != "/usr/local/include" -a \ + "$dir" != "/usr/include"; then + CFLAGS="-I$dir $CFLAGS" + CPPFLAGS="-I$dir $CPPFLAGS" + fi + AC_MSG_RESULT(yes) + break + else + AC_MSG_RESULT(no) + fi + done + AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \ + AC_MSG_ERROR([required C header missing!])) + AC_DEFINE(ZEROCONF, 1) fi +# do IDENT requests using libident? + x_identauth_on=no AC_ARG_WITH(ident, [ --with-ident enable "IDENT" ("AUTH") protocol support], - [ if test "$withval" = "yes"; then + [ 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_LIB(ident, ident_id) AC_CHECK_FUNCS(ident_id, x_identauth_on=yes, AC_MSG_ERROR([Can't enable IDENT support!]) @@ -219,9 +456,11 @@ AC_ARG_WITH(ident, ) if test "$x_identauth_on" = "yes"; then AC_DEFINE(IDENTAUTH, 1) - AC_CHECK_HEADERS(ident.h) + AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!])) fi +# compile in IRC+ protocol support? + x_ircplus_on=yes AC_ARG_ENABLE(ircplus, [ --disable-ircplus disable IRC+ protocol], @@ -231,6 +470,21 @@ if test "$x_ircplus_on" = "yes"; then AC_DEFINE(IRCPLUS, 1) fi +# enable support for IPv6? +x_ipv6_on=no +AC_ARG_ENABLE(ipv6, + [ --enable-ipv6 enable IPv6 protocol support], + if test "$enableval" = "yes"; then x_ipv6_on=yes; fi +) +if test "$x_ipv6_on" = "yes"; then + AC_CHECK_FUNCS([ \ + getaddrinfo getnameinfo \ + ],,AC_MSG_ERROR([required function missing for IPv6 support!])) + AC_DEFINE(WANT_IPV6, 1) +fi + +# compile in IRC "sniffer"? + x_sniffer_on=no; x_debug_on=no AC_ARG_ENABLE(sniffer, [ --enable-sniffer enable IRC traffic sniffer (enables debug mode)], @@ -240,6 +494,8 @@ AC_ARG_ENABLE(sniffer, fi ) +# enable additional debugging code? + AC_ARG_ENABLE(debug, [ --enable-debug show additional debug output], if test "$enableval" = "yes"; then x_debug_on=yes; fi @@ -247,8 +503,11 @@ AC_ARG_ENABLE(debug, if test "$x_debug_on" = "yes"; then AC_DEFINE(DEBUG, 1) test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS" + AC_CHECK_FUNCS(mtrace) fi +# enable "strict RFC rules"? + x_strict_rfc_on=no AC_ARG_ENABLE(strict-rfc, [ --enable-strict-rfc strict RFC conformance -- may break clients!], @@ -273,8 +532,10 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" AC_OUTPUT([ \ Makefile \ doc/Makefile \ + doc/src/Makefile \ src/Makefile \ src/portab/Makefile \ + src/ipaddr/Makefile \ src/tool/Makefile \ src/ngircd/Makefile \ src/testsuite/Makefile \ @@ -282,6 +543,8 @@ AC_OUTPUT([ \ contrib/Makefile \ contrib/Debian/Makefile \ contrib/MacOSX/Makefile \ + contrib/MacOSX/ngIRCd.xcodeproj/Makefile \ + contrib/MacOSX/ngIRCd.pmdoc/Makefile \ ]) type dpkg >/dev/null 2>&1 @@ -295,7 +558,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] @@ -321,8 +584,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" \ @@ -330,8 +593,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" \ @@ -339,17 +602,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" = "yes" \ - && 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" \ @@ -357,9 +628,17 @@ 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_N " IPv6 protocol: $ECHO_C" +echo $ECHO_N "$x_ipv6_on $ECHO_C" -echo; echo +echo $ECHO_N " SSL support: $ECHO_C" +echo "$x_ssl_lib" + +echo # -eof-