X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=configure.in;h=9b2c7128fa259c642d4d199b665a8380ca6a6a7d;hp=94ff78d8402bc13ee2220131ad8ac760f341351b;hb=5b35b101f2c5a208c94840e3b020f50d8c91b64f;hpb=34ede2a91aa3f0d4847eb9dcae053ca9746fa171 diff --git a/configure.in b/configure.in index 94ff78d8..9b2c7128 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) +# Copyright (c)2001-2005 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,10 +8,10 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.93 2003/05/05 00:33:32 alex Exp $ +# $Id: configure.in,v 1.124 2006/10/02 21:57:13 fw Exp $ # -# -- Initialisierung -- +# -- Initialisation -- AC_PREREQ(2.50) AC_INIT(ngircd, CVSHEAD) @@ -20,17 +20,18 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) AM_CONFIG_HEADER(src/config.h) -# -- Templates fuer config.h -- +# -- Templates for config.h -- AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled]) AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists]) AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled]) AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant]) -AH_TEMPLATE([USE_SYSLOG], [Define if syslog should be used for logging]) -AH_TEMPLATE([USE_ZLIB], [Define if zlib compression should be enabled]) -AH_TEMPLATE([USE_TCPWRAP], [Define if TCP wrappers should be used]) +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]) AH_TEMPLATE([TARGET_VENDOR], [Target system vendor]) @@ -40,7 +41,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name]) AC_PROG_CC -# -- Hilfsprogramme -- +# -- Helper programs -- AC_PROG_AWK AC_PROG_INSTALL @@ -50,47 +51,52 @@ AC_PROG_RANLIB # -- Compiler Features -- -AC_LANG_C - 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 +]) -# -- Defines -- -os=`uname` +if test "$GCC" = "yes"; then + # We are using the GNU C compiler. Good! + CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes" -if test "$os" = "Linux" -o $os = "GNU"; then - # define _POSIX_SOURCE, _GNU_SOURCE and _BSD_SOURCE when compiling - # on Linux or Hurd (glibc-based systems): - AC_MSG_RESULT([detected ${os}, defining _POSIX_SOURCE, _GNU_SOURCE and _BSD_SOURCE]) - add_DEFINES="-D_POSIX_SOURCE -D_GNU_SOURCE -D_BSD_SOURCE $add_DEFINES" + GCC_STACK_PROTECT_CC fi -if test "$os" = "A/UX"; then - # define _POSIX_SOURCE when compiling on A/UX: - AC_MSG_RESULT([detected A/UX, defining _POSIX_SOURCE]) - add_DEFINES="-D_POSIX_SOURCE $add_DEFINES" -fi +case "$target_os" in + hpux*) + # This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED + # (tested with HP/UX 11.11) + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + ;; +esac -if test "$os" = "HP-UX"; then - # define _XOPEN_SOURCE_EXTENDED when compiling on HP-UX (11.11): - AC_MSG_RESULT([detected HP-UX, defining _XOPEN_SOURCE_EXTENDED]) - add_DEFINES="-D_XOPEN_SOURCE_EXTENDED $add_DEFINES" -fi +# Add additional CFLAGS, eventually specified on the command line: +test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD" -if test "$os" = "SunOS"; then - # define _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED=1 and __EXTENSIONS__ - # when compiling on SunOS (tested with 5.6): - AC_MSG_RESULT([detected SunOS, defining _XOPEN_SOURCE, _XOPEN_SOURCE_EXTENDED=1 and __EXTENSIONS__]) - add_DEFINES="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ $add_DEFINES" -fi +CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'" -# -- Header -- +# -- Headers -- AC_HEADER_STDC - AC_HEADER_TIME - AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([ \ @@ -98,14 +104,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]) -# -- Datentypen -- +# -- 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; @@ -116,40 +122,42 @@ AC_TRY_COMPILE([ ]) AC_TYPE_SIGNAL - AC_TYPE_SIZE_T + # -- Libraries -- AC_CHECK_LIB(UTIL,memmove) AC_CHECK_LIB(socket,bind) AC_CHECK_LIB(nsl,gethostent) -# -- Funktionen -- - -AC_FUNC_MALLOC +# -- Functions -- AC_FUNC_FORK - AC_FUNC_STRFTIME AC_CHECK_FUNCS([ \ - bind gethostbyaddr gethostbyname gethostname inet_ntoa memmove \ - memset setsockopt socket strcasecmp strchr strerror strstr waitpid \ - ],,AC_MSG_ERROR([required function missing!])) + bind gethostbyaddr gethostbyname gethostname inet_ntoa malloc memmove \ + memset realloc setsid setsockopt socket strcasecmp strchr strcspn 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!]) ) -# -- Konfigurationsoptionen -- +# -- Configuration options -- 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!]) @@ -162,14 +170,19 @@ AC_ARG_WITH(syslog, ] ) if test "$x_syslog_on" = "yes"; then - AC_DEFINE(USE_SYSLOG, 1) - AC_CHECK_HEADERS(syslog.h) + AC_DEFINE(SYSLOG, 1) + AC_CHECK_HEADERS(syslog.h,,AC_MSG_ERROR([required C header missing!])) fi 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!]) @@ -181,24 +194,106 @@ AC_ARG_WITH(zlib, ] ) if test "$x_zlib_on" = "yes"; then - AC_DEFINE(USE_ZLIB, 1) - AC_CHECK_HEADERS(zlib.h) + AC_DEFINE(ZLIB, 1) + AC_CHECK_HEADERS(zlib.h,,AC_MSG_ERROR([required C header missing!])) fi + +x_io_backend=select\(\) +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 support!]) + ) + fi + ], + [ + AC_CHECK_FUNCS(poll, x_io_backend=poll\(\)) + ] +) + + +AC_ARG_WITH(devpoll, + [ --without-devpoll disable /dev/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_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 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], - [ 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(USE_TCPWRAP, 1) + AC_DEFINE(TCPWRAP, 1) x_tcpwrap_on=yes ],[ AC_MSG_RESULT(no) @@ -208,19 +303,73 @@ 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!]) +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_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 + +x_identauth_on=no +AC_ARG_WITH(ident, + [ --with-ident enable "IDENT" ("AUTH") protocol support], + [ 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!]) ) fi ] ) -if test "$x_rendezvous_on" = "yes"; then - AC_DEFINE(RENDEZVOUS, 1) - AC_CHECK_HEADERS(DNSServiceDiscovery/DNSServiceDiscovery.h mach/port.h) +if test "$x_identauth_on" = "yes"; then + AC_DEFINE(IDENTAUTH, 1) + AC_CHECK_HEADERS(ident.h,,AC_MSG_ERROR([required C header missing!])) fi x_ircplus_on=yes @@ -247,6 +396,7 @@ AC_ARG_ENABLE(debug, ) if test "$x_debug_on" = "yes"; then AC_DEFINE(DEBUG, 1) + test "$GCC" = "yes" && CFLAGS="-pedantic $CFLAGS" fi x_strict_rfc_on=no @@ -258,50 +408,22 @@ AC_ARG_ENABLE(strict-rfc, fi ) -# -- Definitionen -- +# -- Definitions -- AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu" ) AC_DEFINE_UNQUOTED(TARGET_VENDOR, "$target_vendor" ) AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) -# -- Variablen -- - -if test "$GCC" = "yes"; then - the_CFLAGS="-Wmissing-declarations -Wpointer-arith -Wstrict-prototypes" - ansi=" -ansi" - pedantic=" -pedantic" - - $CC --version | grep 20020420 > /dev/null 2>&1 - if test $? -eq 0; then - # Mac OS X (and Darwin?) ship with a slightly broken - # prerelease of GCC 3.1 which don't like -pedantic: - AC_MSG_RESULT([detected broken GNU C compiler, disabling "-pedantic"]) - pedantic="" - fi - - uname | grep "CYGWIN" > /dev/null 2>&1 - if test $? -eq 0; then - # The include files of Cygwin don't like -ansi, - # so we disable it: - AC_MSG_RESULT([detected Cygwin, disabling "-ansi"]) - ansi="" - fi - - add_CFLAGS="-Wall -W${ansi}${pedantic} $CFLAGS $CFLAGS_ADD" -else - the_CFLAGS="$CFLAGS" - add_CFLAGS="$CFLAGS_ADD" -fi - -CFLAGS="$the_CFLAGS $add_CFLAGS $add_DEFINES -DSYSCONFDIR='\"\$(sysconfdir)\"'" +# Add additional CFLAGS, eventually specified on the command line, but after +# running this configure script. Useful for "-Werror" for example. +test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" -# -- Ausgabe der Dateien -- +# -- Generate files -- AC_OUTPUT([ \ Makefile \ doc/Makefile \ - MacOSX/Makefile \ - MacOSX/ngircd.pbproj/Makefile \ + doc/src/Makefile \ src/Makefile \ src/portab/Makefile \ src/tool/Makefile \ @@ -309,12 +431,22 @@ AC_OUTPUT([ \ src/testsuite/Makefile \ man/Makefile \ contrib/Makefile \ + contrib/Debian/Makefile \ + contrib/MacOSX/Makefile \ ]) +type dpkg >/dev/null 2>&1 +if test $? -eq 0; then + # Generate debian/ link if the dpkg command exists + # (read: if we are running on a debian compatible system) + echo "creating Debian-specific links ..." + test -f debian/rules || ln -s contrib/Debian debian +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] @@ -324,11 +456,10 @@ C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}` M=`eval echo ${mandir}` ; M=`eval echo ${M}` D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}` -echo " Host: ${host}" +echo " Target: ${target}" +test "$target" != "$host" && echo " Host: ${host}" echo " Compiler: ${CC}" -echo " Compiler flags: ${the_CFLAGS}" -test -n "$add_CFLAGS" && echo " ${add_CFLAGS}" -test -n "$add_DEFINES" && echo " ${add_DEFINES}" +test -n "$CFLAGS" && echo " Compiler flags: ${CFLAGS}" test -n "$CPPFLAGS" && echo " Preprocessor flags: ${CPPFLAGS}" test -n "$LDFLAGS" && echo " Linker flags: ${LDFLAGS}" test -n "$LIBS" && echo " Libraries: ${LIBS}" @@ -341,8 +472,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" \ @@ -350,8 +481,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" \ @@ -359,21 +490,37 @@ 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" \ || echo "no" + +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 " I/O backend: $ECHO_C" + echo "\"$x_io_backend\"" + echo # -eof-