]> arthur.barton.de Git - ngircd-alex.git/blobdiff - configure.in
Update NEWS and ChangeLog files
[ngircd-alex.git] / configure.in
index ef22dab56e0bb6197e24c17985d54f79c34ff092..fb0877839383b7611adb7548d511938351327d79 100644 (file)
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors
 #
 # 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,18 +8,20 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.112 2005/07/07 18:49:58 fw Exp $
-#
+
+define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n))
 
 # -- Initialisation --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, CVSHEAD)
+AC_INIT(ngircd, VERSION_ID)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
 AM_CONFIG_HEADER(src/config.h)
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 # -- Templates for config.h --
 
 AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])
@@ -30,8 +32,10 @@ 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([IDENTAUTH], [Define if the server should do IDENT requests])
+AH_TEMPLATE([PAM], [Define if PAM should be used])
+AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
 AH_TEMPLATE([TARGET_VENDOR], [Target system vendor])
@@ -40,6 +44,8 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name])
 # -- C Compiler --
 
 AC_PROG_CC
+AC_PROG_CC_STDC
+AC_C_PROTOTYPES
 
 # -- Helper programs --
 
@@ -53,12 +59,30 @@ 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
@@ -81,11 +105,24 @@ AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 
 AC_CHECK_HEADERS([ \
-       ctype.h errno.h fcntl.h netdb.h netinet/in.h stdlib.h string.h \
-       strings.h sys/socket.h sys/time.h unistd.h \
+       ctype.h errno.h fcntl.h netdb.h netinet/in.h netinet/in_systm.h \
+       stdlib.h string.h 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 stdbool.h stddef.h varargs.h])
+AC_CHECK_HEADERS([ \
+       arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \
+       ],[],[],[[
+       #ifdef HAVE_SYS_TYPES_H
+               #include <sys/types.h>
+       #endif
+       #ifdef HAVE_SYS_SOCKET_H
+               #include <sys/socket.h>
+       #endif
+       #ifdef HAVE_NETINET_IN_H
+               #include <netinet/in.h>
+       #endif
+       ]]
+)
 
 # -- Datatypes --
 
@@ -105,11 +142,16 @@ AC_TRY_COMPILE([
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 
+AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),,
+ [#include <arpa/inet.h>])
+
 # -- Libraries --
 
+# A/UX needs this.
 AC_CHECK_LIB(UTIL,memmove)
+# needed on solaris. GNU libc also has a libnsl, but we do not need it.
+AC_SEARCH_LIBS(gethostbyname,nsl)
 AC_CHECK_LIB(socket,bind)
-AC_CHECK_LIB(nsl,gethostent)
 
 # -- Functions --
 
@@ -117,18 +159,18 @@ 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!]))
-
-AC_CHECK_FUNCS(inet_aton isdigit sigaction snprintf vsnprintf strdup strlcpy strlcat)
+       bind gethostbyaddr gethostbyname gethostname inet_ntoa \
+       setsid setsockopt socket strcasecmp waitpid],,
+       AC_MSG_ERROR([required function missing!]))
 
-AC_CHECK_FUNCS(select,[AC_CHECK_HEADERS(sys/select.h)],
-       AC_MSG_ERROR([required function select() is missing!])
-)
+AC_CHECK_FUNCS([ \
+       gai_strerror getaddrinfo getnameinfo inet_aton sigaction \
+       sigprocmask 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)],
@@ -154,6 +196,8 @@ if test "$x_syslog_on" = "yes"; then
        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)],
@@ -178,44 +222,174 @@ if test "$x_zlib_on" = "yes"; then
        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, [
+                               AC_CHECK_HEADERS(poll.h,
+                                       x_io_backend=poll\(\),
+                                       AC_MSG_ERROR(
+                                            [Can't enable poll IO support!])
+                               )
+                       ], [
+                               AC_MSG_ERROR([Can't enable poll IO support!])
+                       ])
+               fi
+       ],
+       [
+               AC_CHECK_FUNCS(poll, [
+                       AC_CHECK_HEADERS(poll.h, 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)
+       ]
+)
 
-x_io_backend=select
 AC_ARG_WITH(epoll,
-       [  --without-epoll          disable epoll support (autodetected by default)],
+       [  --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_backend=epoll,
-                               AC_MSG_ERROR([Can't enable epoll support!])
+                       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_backend=epoll)
+               AC_CHECK_FUNCS(epoll_create, x_io_epoll=yes)
        ]
 )
 
 AC_ARG_WITH(kqueue,
-       [  --without-kqueue          disable kqueue support (autodetected by default)],
+       [  --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 support!])
+                       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)
+               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 useable IO API activated/found!?])
+fi
+
+# use SSL?
+
+AC_ARG_WITH(openssl,
+       [  --with-openssl          enable SSL support using OpenSSL],
+       [       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(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" != "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(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,
@@ -246,74 +420,58 @@ int deny_severity = 0;
        ]
 )
 
-x_rendezvous_on=no
-AC_ARG_WITH(rendezvous,
-       [  --with-rendezvous       enable support for "Rendezvous"],
+# 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_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_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!]))
-                       ])
+                       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" = "osx"; then
-       AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \
-        mach/port.h],,AC_MSG_ERROR([required C header missing!]))
-       AC_DEFINE(RENDEZVOUS, 1)
-fi
-if test "$x_rendezvous_on" = "howl"; then
-       for dir in /usr/local/include /usr/local/include/howl* \
-        /usr/include /usr/include/howl*; 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(RENDEZVOUS, 1)
+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_identauth_on=no
-AC_ARG_WITH(ident,
-       [  --with-ident            enable "IDENT" ("AUTH") protocol support],
+# compile in PAM support?
+
+x_pam_on=no
+AC_ARG_WITH(pam,
+       [  --with-pam              enable user authentication using PAM],
        [       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!])
+                       AC_CHECK_LIB(pam, pam_authenticate)
+                       AC_CHECK_FUNCS(pam_authenticate, x_pam_on=yes,
+                               AC_MSG_ERROR([Can't enable PAM 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!]))
+if test "$x_pam_on" = "yes"; then
+       AC_DEFINE(PAM, 1)
+       AC_CHECK_HEADERS(security/pam_appl.h,pam_ok=yes)
+       if test "$pam_ok" != "yes"; then
+               AC_CHECK_HEADERS(pam/pam_appl.h,pam_ok=yes,
+                       AC_MSG_ERROR([required C header missing!]))
+       fi
 fi
 
+# compile in IRC+ protocol support?
+
 x_ircplus_on=yes
 AC_ARG_ENABLE(ircplus,
        [  --disable-ircplus       disable IRC+ protocol],
@@ -323,6 +481,23 @@ 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
+       # getaddrinfo() and getnameinfo() are optional when not compiling
+       # with IPv6 support, but are required for IPv6 to work!
+       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)],
@@ -332,6 +507,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
@@ -339,8 +516,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!],
@@ -365,15 +545,20 @@ 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 \
        man/Makefile \
        contrib/Makefile \
+       contrib/Anope/Makefile \
        contrib/Debian/Makefile \
        contrib/MacOSX/Makefile \
+       contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
+       contrib/MacOSX/ngIRCd.pmdoc/Makefile \
 ])
 
 type dpkg >/dev/null 2>&1
@@ -395,7 +580,7 @@ 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}`
-D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}`
+D=`eval echo ${docdir}` ; D=`eval echo ${D}`
 
 echo "             Target: ${target}"
 test "$target" != "$host" && echo "               Host: ${host}"
@@ -413,8 +598,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" \
@@ -422,8 +607,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" \
@@ -431,29 +616,36 @@ 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 "      IDENT support: $ECHO_C"
+test "$x_identauth_on" = "yes" \
+       && echo $ECHO_N "yes   $ECHO_C" \
+       || echo $ECHO_N "no    $ECHO_C"
 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 "      IPv6 protocol: $ECHO_C"
+test "$x_ipv6_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 "\"$x_io_backend\""
+
+echo $ECHO_N "        PAM support: $ECHO_C"
+test "$x_pam_on" = "yes" \
+       && echo $ECHO_N "yes   $ECHO_C" \
+       || echo $ECHO_N "no    $ECHO_C"
+echo $ECHO_N "        SSL support: $ECHO_C"
+echo "$x_ssl_lib"
 
-echo; echo
+echo
 
 # -eof-