Revamp the networking code in httpd.c to support IPv6. Side effects

[sgt/agedu] / configure.ac

diff --git a/configure.ac b/configure.ac
index 96a813f..87c153b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AM_CONDITIONAL([HAVE_HALIBUT],[test "x$HALIBUT" = "xyes"])
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([assert.h arpa/inet.h ctype.h errno.h fcntl.h features.h fnmatch.h limits.h netinet/in.h pwd.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/socket.h syslog.h termios.h time.h unistd.h])
+AC_CHECK_HEADERS([assert.h arpa/inet.h ctype.h errno.h fcntl.h features.h fnmatch.h limits.h netdb.h netinet/in.h pwd.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/socket.h syslog.h termios.h time.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -38,9 +38,25 @@ AC_FUNC_VPRINTF
 AC_SEARCH_LIBS(connect, socket nsl)
 AC_SEARCH_LIBS(inet_ntoa, socket nsl)
 AC_SEARCH_LIBS(inet_addr, socket nsl)
-# AC_SEARCH_LIBS(gethostbyname, socket nsl resolv) # (if we used gethostbyname)
-
-AC_CHECK_FUNCS([ftruncate fdopendir lstat64 stat64 memchr munmap select socket strcasecmp strchr strcspn strerror strrchr strspn strtoul strtoull connect inet_ntoa inet_addr])
+AC_SEARCH_LIBS(gethostbyname, socket nsl resolv)
+AC_SEARCH_LIBS(getaddrinfo, socket nsl resolv)
+
+AC_CHECK_FUNCS([ftruncate fdopendir lstat64 stat64 memchr munmap select socket strcasecmp strchr strcspn strerror strrchr strspn strtoul strtoull connect inet_ntoa inet_addr gethostbyname getaddrinfo])
+
+AC_ARG_ENABLE([ipv6],
+              AS_HELP_STRING([--disable-ipv6],
+                             [disable IPv6 in the built-in web server]),
+              [ipv6=$enableval],[ipv6=$ac_cv_func_getaddrinfo])
+AC_ARG_ENABLE([ipv4],
+              AS_HELP_STRING([--disable-ipv4],
+                             [disable IPv4 in the built-in web server]),
+              [ipv4=$enableval],[ipv4=yes])
+if test "$ipv6" = "no"; then
+  AC_DEFINE([NO_IPV6], [1], [define if IPv6 is disabled at configure time])
+fi
+if test "$ipv4" = "no"; then
+  AC_DEFINE([NO_IPV4], [1], [define if IPv4 is disabled at configure time])
+fi
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT