]> arthur.barton.de Git - ngircd-alex.git/blobdiff - configure.in
Fix double minus signs in manual pages
[ngircd-alex.git] / configure.in
index 470fcfb105cc9411fd877799ce300ed4a0c3d0d4..61bf08e939333b6f5b1c1165d516ead18fb23882 100644 (file)
@@ -1,34 +1,36 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
 #
-# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
-# der GNU General Public License (GPL), wie von der Free Software Foundation
-# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
-# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
-# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
-# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
-#
-# $Id: configure.in,v 1.67 2002/11/15 22:08:19 alex Exp $
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# Please read the file COPYING, README and AUTHORS for more information.
 #
 
-# -- Initialisierung --
+# -- Initialisation --
 
-AC_INIT
 AC_PREREQ(2.50)
+AC_INIT(ngircd, dev)
+AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
-AC_CONFIG_SRCDIR(src/config.h.in)
-AM_INIT_AUTOMAKE(ngircd,CVSHEAD)
+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([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([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])
 AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
@@ -38,7 +40,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 
 AC_PROG_CC
 
-# -- Hilfsprogramme --
+# -- Helper programs --
 
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -48,31 +50,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 --
 
-if test `uname` = "A/UX"; then
-       # unter A/UX sollte _POSIX_SOURCE definiert sein.
-       AC_MSG_RESULT([detected A/UX, defining _POSIX_SOURCE])
-       CFLAGS="$CFLAGS -D_POSIX_SOURCE"
-fi
+if test "$GCC" = "yes"; then
+       # We are using the GNU C compiler. Good!
+       CFLAGS="$CFLAGS -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes"
 
-if test `uname` = "HP-UX"; then
-       # unter HP-UX 11.11 muss _XOPEN_SOURCE_EXTENDED definiert sein.
-       AC_MSG_RESULT([detected HP-UX, defining _XOPEN_SOURCE_EXTENDED])
-       CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+       GCC_STACK_PROTECT_CC
 fi
 
-# -- Header --
+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
 
-AC_HEADER_STDC
+# Add additional CFLAGS, eventually specified on the command line:
+test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
 
-AC_HEADER_TIME
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+
+# -- Headers --
 
+AC_HEADER_STDC
+AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
@@ -80,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 malloc.h stdint.h sys/select.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 <sys/socket.h>
-       #include <sys/types.h>
+#include <sys/types.h>
+#include <sys/socket.h>
        ],[
        socklen_t a, b;
        a = 2; b = 4; a += b;
@@ -98,49 +121,346 @@ 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 select 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 sigaction snprintf vsnprintf)
+AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat strtok_r)
 
-# -- Konfigurationsoptionen --
+# -- Configuration options --
+
+# use syslog?
 
 x_syslog_on=no
-AC_ARG_ENABLE(syslog,
-       [  --disable-syslog        disable syslog (autodetected by default)],
-       [       if test "$enableval" = "yes"; then
-                       AC_CHECK_HEADER(syslog.h, x_syslog_on=yes,
-                               AC_MSG_ERROR([Can't enable syslog: syslog.h not found!])
+AC_ARG_WITH(syslog,
+       [  --without-syslog        disable syslog (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_LIB(be, syslog)
+                       AC_CHECK_FUNCS(syslog, x_syslog_on=yes,
+                               AC_MSG_ERROR([Can't enable syslog!])
                        )
                fi
        ],
-       [       AC_CHECK_HEADER(syslog.h, x_syslog_on=yes) ]
+       [
+               AC_CHECK_LIB(be, syslog)
+               AC_CHECK_FUNCS(syslog, x_syslog_on=yes)
+       ]
 )
 if test "$x_syslog_on" = "yes"; then
-       AC_DEFINE(USE_SYSLOG, 1)
-       AC_CHECK_LIB(be,syslog)
+       AC_DEFINE(SYSLOG, 1)
+       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" != "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!])
+                       )
+               fi
+       ],
+       [       AC_CHECK_LIB(z, deflate)
+               AC_CHECK_FUNCS(deflate, x_zlib_on=yes)
+       ]
+)
+if test "$x_zlib_on" = "yes"; then
+       AC_DEFINE(ZLIB, 1)
+       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" != "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 <tcpd.h>
+int allow_severity = 0;
+int deny_severity = 0;
+                               ],[
+                               tcpd_warn("link test");
+                               ],[
+                               AC_MSG_RESULT(yes)
+                               AC_DEFINE(TCPWRAP, 1)
+                               x_tcpwrap_on=yes
+                               ],[
+                               AC_MSG_RESULT(no)
+                               AC_MSG_ERROR([Can't enable TCP wrappers!])
+                       ])
+               fi
+       ]
+)
+
+# 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_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" != "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_identauth_on" = "yes"; then
+       AC_DEFINE(IDENTAUTH, 1)
+       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],
@@ -150,6 +470,22 @@ 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)],
        if test "$enableval" = "yes"; then
@@ -158,14 +494,21 @@ 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
 )
 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!],
        if test "$enableval" = "yes"; then
@@ -174,41 +517,48 @@ 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 --
+# 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"
 
-if test "$GCC" = "yes"; then
-       CFLAGS="-Wall $CFLAGS"
-fi
-
-the_CFLAGS="$CFLAGS"
-
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
-
-# -- Ausgabe der Dateien --
+# -- Generate files --
 
 AC_OUTPUT([ \
        Makefile \
        doc/Makefile \
-       doc/en/Makefile \
-       MacOSX/Makefile \
-       MacOSX/ngircd.pbproj/Makefile \
+       doc/src/Makefile \
        src/Makefile \
        src/portab/Makefile \
+       src/ipaddr/Makefile \
+       src/tool/Makefile \
        src/ngircd/Makefile \
        src/testsuite/Makefile \
        man/Makefile \
        contrib/Makefile \
+       contrib/Debian/Makefile \
+       contrib/MacOSX/Makefile \
+       contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
+       contrib/MacOSX/ngIRCd.pmdoc/Makefile \
 ])
 
-# -- Ergebnis --
+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 $PACKAGE_VERSION has been configured with the following options:"
 echo
 
 # Someone please show me a better way :)  [borrowed by OpenSSH]
@@ -216,25 +566,79 @@ B=`eval echo ${bindir}` ; B=`eval echo ${B}`
 S=`eval echo ${sbindir}` ; S=`eval echo ${S}`
 C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}`
 M=`eval echo ${mandir}` ; M=`eval echo ${M}`
-
-echo "                host: ${host}"
-echo "            compiler: ${CC}"
-echo "      compiler flags: ${the_CFLAGS}"
-echo "  preprocessor flags: ${CPPFLAGS}"
-echo "        linker flags: ${LDFLAGS}"
-echo "           libraries: ${LIBS}"
+D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`
+
+echo "             Target: ${target}"
+test "$target" != "$host" && echo "               Host: ${host}"
+echo "           Compiler: ${CC}"
+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}"
 echo
-echo "     'ngircd' binary: $S"
-echo "  configuration file: $C"
-echo "        manual pages: $M"
+echo "    'ngircd' binary: $S"
+echo " Configuration file: $C"
+echo "       Manual pages: $M"
+echo "      Documentation: $D"
 echo
 
-echo $ECHO_N "      active options: $ECHO_C"
-test "$x_syslog_on" = "yes"    && echo $ECHO_N "Syslog $ECHO_C"
-test "$x_debug_on" = "yes"     && echo $ECHO_N "Debug $ECHO_C"
-test "$x_sniffer_on" = "yes"   && echo $ECHO_N "Sniffer $ECHO_C"
-test "$x_strict_rfc_on" = "yes"        && echo $ECHO_N "Strict-RFC $ECHO_C"
-test "$x_ircplus_on" = "yes"   && echo $ECHO_N "IRC+ $ECHO_C"
-echo; 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 "  Enable debug code: $ECHO_C"
+test "$x_debug_on" = "yes" \
+       && echo "yes" \
+       || echo "no"
+
+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 "        IRC sniffer: $ECHO_C"
+test "$x_sniffer_on" = "yes" \
+       && echo "yes" \
+       || echo "no"
+
+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 "    Strict RFC mode: $ECHO_C"
+test "$x_strict_rfc_on" = "yes" \
+       && echo "yes" \
+       || echo "no"
+
+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 $ECHO_N "      IPv6 protocol: $ECHO_C"
+echo $ECHO_N "$x_ipv6_on    $ECHO_C"
+
+echo $ECHO_N "        SSL support: $ECHO_C"
+echo "$x_ssl_lib"
+
+echo
 
 # -eof-