Autodetect support for IPv6 by default

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 899d00f762eb4e957bef2d6268691acbe0d4eccb..195e4067beda5d12e6b0e58032c6848313ee548e 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2024 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
@@ -29,7 +29,7 @@ AC_CONFIG_SRCDIR([src/ngircd/ngircd.c])
 AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([-Wall 1.10 ]ng_color_tests)
+AM_INIT_AUTOMAKE([-Wall 1.10 foreign ]ng_color_tests)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -101,6 +101,7 @@ AC_DEFUN([WORKING_GETADDRINFO],[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <string.h>
 int
 main(int argc, char **argv)
 {
@@ -265,6 +266,7 @@ AC_CHECK_FUNCS_ONCE([
        strlcat \
        strlcpy \
        strndup \
+       strsignal \
        strtok_r \
        unsetenv \
        vsnprintf \
@@ -465,7 +467,8 @@ AC_ARG_WITH(openssl,
                                LDFLAGS="-L$withval/lib $LDFLAGS"
                        fi
                        PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto],
-                               [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"],
+                               [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+                               AC_DEFINE(HAVE_LIBSSL, 1)],
                                [AC_CHECK_LIB(crypto, BIO_s_mem)
                                AC_CHECK_LIB(ssl, SSL_new)]
                        )
@@ -504,6 +507,8 @@ if test "$x_ssl_openssl" = "yes"; then
        x_ssl_lib=openssl
 fi
 
+AM_CONDITIONAL(HAVE_SSL, [test $x_ssl_lib != "no"])
+
 # use TCP wrappers?
 
 x_tcpwrap_on=no
@@ -634,18 +639,24 @@ if test "$x_ircplus_on" = "yes"; then
 fi
 
 # enable support for IPv6?
-x_ipv6_on=no
+
+x_ipv6_on=yes
 AC_ARG_ENABLE(ipv6,
-       AS_HELP_STRING([--enable-ipv6],
-                      [enable IPv6 protocol support]),
-       if test "$enableval" = "yes"; then x_ipv6_on=yes; fi
+       AS_HELP_STRING([--disable-ipv6],
+                      [disable IPv6 protocol support (autodetected by default)]),
+       [       if test "$enableval" = "no"; then
+                       x_ipv6_on=no
+               else
+                       AC_CHECK_FUNCS(
+                               [getaddrinfo getnameinfo],,
+                               AC_MSG_ERROR([required function missing for IPv6 support!])
+                       )
+               fi
+       ],
+       [       AC_CHECK_FUNCS([getaddrinfo getnameinfo],, x_ipv6_on=no)
+       ]
 )
 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
 
@@ -704,9 +715,6 @@ test -n "$LIBS_END" && LIBS="$LIBS $LIBS_END"
 AC_CONFIG_FILES([ \
        Makefile \
        contrib/Debian/Makefile \
-       contrib/MacOSX/Makefile \
-       contrib/MacOSX/ngIRCd.pmdoc/Makefile \
-       contrib/MacOSX/ngIRCd.xcodeproj/Makefile \
        contrib/Makefile \
        doc/Makefile \
        doc/src/Makefile \