[svn] Also check for short for int32_t.

[wget] / configure.in

diff --git a/configure.in b/configure.in
index 4e44568546a1bfb0e4621a5b657e540bb1c88ee5..d9104895ebb171d52780f89506152f12db45c078 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,7 +30,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 
 AC_INIT(src/version.c)
-AC_PREREQ(2.12)
+AC_PREREQ(2.50)
 AC_CONFIG_HEADER(src/config.h)
 
 dnl
@@ -56,8 +56,8 @@ AC_ARG_WITH(socks,
 [AC_DEFINE(HAVE_SOCKS)])
 
 AC_ARG_WITH(ssl,
-[  --with-ssl[=SSL-ROOT]   link with SSL support [default=auto]
-  --without-ssl           disable SSL autodetection])
+[[  --with-ssl[=SSL-ROOT]   link with SSL support [default=auto]
+  --without-ssl           disable SSL autodetection]])
 
 AC_ARG_ENABLE(opie,
 [  --disable-opie          disable support for opie or s/key FTP login],
@@ -71,8 +71,8 @@ test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
 
 AC_ARG_ENABLE(debug,
 [  --disable-debug         disable support for debugging output],
-DEBUG=$enableval, DEBUG=yes)
-test x"${DEBUG}" = xyes && AC_DEFINE(DEBUG)
+ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
 
 wget_need_md5=no
 
@@ -155,12 +155,17 @@ AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
-dnl #### This generates a warning.  What do I do to shut it up?
 AC_C_BIGENDIAN
 
-# Check size of long.
+dnl
+dnl Check integral type sizes.
+dnl
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
+AC_CHECK_TYPES(int32_t)
+AC_CHECK_TYPES(u_int32_t)
 
 dnl
 dnl Checks for headers
@@ -176,8 +181,10 @@ dnl
 AC_TYPE_SIGNAL
 
 dnl
-dnl Check for struct utimbuf
+dnl Call several of Wget's macros.
+dnl
 WGET_STRUCT_UTIMBUF
+WGET_SOCKLEN_T
 
 dnl
 dnl Checks for library functions.
@@ -360,9 +367,9 @@ int RSA_new();
 int SSL_new();
 main(){return 0;}
 ],
-      AC_MSG_RESULT("yes"),
-      AC_MSG_RESULT("no"); ssl_run_failure=yes,
-      AC_MSG_RESULT("cross")
+      AC_MSG_RESULT(yes),
+      AC_MSG_RESULT(no); ssl_run_failure=yes,
+      AC_MSG_RESULT(cross)
     )
 
     if test x"$ssl_run_failure" = xno; then
@@ -442,6 +449,76 @@ fi
 AC_DEFINE(HAVE_MD5)
 AC_SUBST(MD5_OBJ)
 
+dnl **********************************************************************
+dnl Checks for IPv6
+dnl **********************************************************************
+
+ipv6=
+check_for_ipv6=no
+AC_ARG_ENABLE(ipv6,
+  AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
+  [case "${enable_ipv6}" in
+  no)
+    AC_MSG_NOTICE([Disabling IPv6 at user request])
+    ipv6=no
+    ;;
+  *)
+    ipv6=yes
+    ;;
+  esac],
+  [check_for_ipv6=no]
+)
+
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
+  AC_CHECK_FUNCS(getaddrinfo,[
+    GETADDRINFO_AI_ADDRCONFIG(
+      AC_DEFINE(
+        [HAVE_GETADDRINFO_AI_ADDRCONFIG], 1, 
+        [Define if the system headers support the AI_ADDRCONFIG flag.]
+      )
+    )
+    GETADDRINFO_AI_V4MAPPED(
+      AC_DEFINE(
+        [HAVE_GETADDRINFO_AI_V4MAPPED], 1, 
+        [Define if the system headers support the AI_V4MAPPED flag.]
+      )
+    )
+    GETADDRINFO_AI_ALL(
+      AC_DEFINE(
+        [HAVE_GETADDRINFO_AI_ALL], 1, 
+        [Define if the system headers support the AI_ALL flag.]
+      )
+    )
+  ],[
+    AC_MSG_NOTICE([Disabling IPv6 support: your system does not support getaddrinfo(3)])
+    ipv6=no
+  ])
+fi
+  
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
+  PROTO_INET6(,[
+    AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])
+    ipv6=no
+  ])
+fi
+
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
+  TYPE_STRUCT_SOCKADDR_IN6([
+    ipv6=yes
+  ],[
+    AC_MSG_NOTICE([Disabling IPv6 support: your system does not support 'struct sockaddr_in6'])
+    ipv6=no
+  ])
+  if test "X$ipv6" = "Xyes"; then
+    MEMBER_SIN6_SCOPE_ID
+  fi
+fi
+
+if test "X$ipv6" = "Xyes"; then
+  AC_DEFINE([ENABLE_IPV6], 1, [Define if IPv6 support is enabled.])
+fi
+
+
 dnl
 dnl Set of available languages.
 dnl