[svn] Changed version number to 1.10-alpha3+cvs-dev after tagging version 1.10-alpha3...

[wget] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index a85014ab79a5b26eb0ba46c18caf2fd234f1fbb0..cf93b2bfaac31e6d3c4f183b22fd72034d64a2dc 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -3,19 +3,15 @@ dnl Check for `struct utimbuf'.
 dnl
 
 AC_DEFUN([WGET_STRUCT_UTIMBUF], [
-  AC_MSG_CHECKING([for struct utimbuf])
-  if test x"$ac_cv_header_utime_h" = xyes; then
-    AC_EGREP_CPP([struct[      ]+utimbuf],
-      [#include <utime.h>
-      ], [
-       AC_DEFINE([HAVE_STRUCT_UTIMBUF], 1,
-                 [Define if you have struct utimbuf.])
-       AC_MSG_RESULT(yes)
-      ],
-      [AC_MSG_RESULT(no)])
-  else
-    AC_MSG_RESULT(no)
-  fi
+  AC_CHECK_TYPES([struct utimbuf], [], [], [
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_UTIME_H
+# include <utime.h>
+#endif
+  ])
 ])
 
 
@@ -27,18 +23,16 @@ dnl size_t *, we use that, else we use int.
 
 AC_DEFUN([WGET_SOCKLEN_T], [
   AC_MSG_CHECKING(for socklen_t)
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([
 #include <sys/types.h>
 #include <sys/socket.h>
 socklen_t x;
-],
-    [], [AC_MSG_RESULT(socklen_t)], [
-      AC_TRY_COMPILE([
+  ], [AC_MSG_RESULT(socklen_t)], [
+    AC_COMPILE_IFELSE([
 #include <sys/types.h>
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
-],
-      [], [
+    ], [
       AC_MSG_RESULT(size_t)
       AC_DEFINE([socklen_t], [size_t],
                 [Define to int or size_t on systems without socklen_t.])
@@ -69,7 +63,7 @@ AC_DEFUN([WGET_FNMATCH], [
 ])
 
 dnl Check for nanosleep.  For nanosleep to work on Solaris, we must
-dnl link with -lt (recently) or with -lposix (older releases).
+dnl link with -lrt (recently) or with -lposix4 (older releases).
 
 AC_DEFUN([WGET_NANOSLEEP], [
   AC_CHECK_FUNCS(nanosleep, [], [
@@ -87,6 +81,12 @@ AC_DEFUN([WGET_NANOSLEEP], [
   ])
 ])
 
+AC_DEFUN([WGET_POSIX_CLOCK], [
+  AC_CHECK_FUNCS(clock_gettime, [], [
+    AC_CHECK_LIB(rt, clock_gettime)
+  ])
+])
+
 dnl Check whether we need to link with -lnsl and -lsocket, as is the
 dnl case on e.g. Solaris.
 
@@ -173,18 +173,18 @@ dnl START OF IPv6 AUTOCONFIGURATION SUPPORT MACROS
 dnl ************************************************************
 
 AC_DEFUN([TYPE_STRUCT_SOCKADDR_IN6],[
-  ds6_have_sockaddr_in6=
+  wget_have_sockaddr_in6=
   AC_CHECK_TYPES([struct sockaddr_in6],[
-    ds6_have_sockaddr_in6=yes
+    wget_have_sockaddr_in6=yes
   ],[
-    ds6_have_sockaddr_in6=no
+    wget_have_sockaddr_in6=no
   ],[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
   ])
 
-  if test "X$ds6_have_sockaddr_in6" = "Xyes"; then :
+  if test "X$wget_have_sockaddr_in6" = "Xyes"; then :
     $1
   else :
     $2
@@ -195,12 +195,12 @@ AC_DEFUN([TYPE_STRUCT_SOCKADDR_IN6],[
 AC_DEFUN([MEMBER_SIN6_SCOPE_ID],[
   AC_REQUIRE([TYPE_STRUCT_SOCKADDR_IN6])
   
-  ds6_member_sin6_scope_id=
-  if test "X$ds6_have_sockaddr_in6" = "Xyes"; then
+  wget_member_sin6_scope_id=
+  if test "X$wget_have_sockaddr_in6" = "Xyes"; then
     AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id],[
-      ds6_member_sin6_scope_id=yes
+      wget_member_sin6_scope_id=yes
     ],[
-      ds6_member_sin6_scope_id=no
+      wget_member_sin6_scope_id=no
     ],[
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -208,7 +208,7 @@ AC_DEFUN([MEMBER_SIN6_SCOPE_ID],[
     ])
   fi
 
-  if test "X$ds6_member_sin6_scope_id" = "Xyes"; then
+  if test "X$wget_member_sin6_scope_id" = "Xyes"; then
     AC_DEFINE([HAVE_SOCKADDR_IN6_SCOPE_ID], 1,
       [Define if struct sockaddr_in6 has the sin6_scope_id member])
     $1
@@ -219,7 +219,7 @@ AC_DEFUN([MEMBER_SIN6_SCOPE_ID],[
 
 
 AC_DEFUN([PROTO_INET6],[
-  AC_CACHE_CHECK([for INET6 protocol support], [ds6_cv_proto_inet6],[
+  AC_CACHE_CHECK([for INET6 protocol support], [wget_cv_proto_inet6],[
     AC_TRY_CPP([
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -231,60 +231,13 @@ AC_DEFUN([PROTO_INET6],[
 #error Mlssing AF_INET6
 #endif
     ],[
-      ds6_cv_proto_inet6=yes
-    ],[
-      ds6_cv_proto_inet6=no
-    ])
-  ])
-
-  if test "X$ds6_cv_proto_inet6" = "Xyes"; then :
-    $1
-  else :
-    $2
-  fi
-])
-
-
-AC_DEFUN([GETADDRINFO_AI_ADDRCONFIG],[
-  AC_CACHE_CHECK([if getaddrinfo supports AI_ADDRCONFIG],
-    [ds6_cv_gai_ai_addrconfig],[
-    AC_TRY_CPP([
-#include <netdb.h>
-
-#ifndef AI_ADDRCONFIG
-#error Missing AI_ADDRCONFIG
-#endif
-    ],[
-      ds6_cv_gai_ai_addrconfig=yes
-    ],[
-      ds6_cv_gai_ai_addrconfig=no
-    ])
-  ])
-
-  if test "X$ds6_cv_gai_ai_addrconfig" = "Xyes"; then :
-    $1
-  else :
-    $2
-  fi
-])
-
-
-AC_DEFUN([GETADDRINFO_AI_ALL],[
-  AC_CACHE_CHECK([if getaddrinfo supports AI_ALL],[ds6_cv_gai_ai_all],[
-    AC_TRY_CPP([
-#include <netdb.h>
-
-#ifndef AI_ALL
-#error Missing AI_ALL
-#endif
-    ],[
-      ds6_cv_gai_ai_all=yes
+      wget_cv_proto_inet6=yes
     ],[
-      ds6_cv_gai_ai_all=no
+      wget_cv_proto_inet6=no
     ])
   ])
 
-  if test "X$ds6_cv_gai_ai_all" = "Xyes"; then :
+  if test "X$wget_cv_proto_inet6" = "Xyes"; then :
     $1
   else :
     $2
@@ -292,26 +245,11 @@ AC_DEFUN([GETADDRINFO_AI_ALL],[
 ])
 
 
-AC_DEFUN([GETADDRINFO_AI_V4MAPPED],[
-  AC_CACHE_CHECK([if getaddrinfo supports AI_V4MAPPED],[ds6_cv_gai_ai_v4mapped],[
-    AC_TRY_CPP([
-#include <netdb.h>
-
-#ifndef AI_V4MAPPED
-#error Missing AI_V4MAPPED
-#endif
-    ],[
-      ds6_cv_gai_ai_v4mapped=yes
-    ],[
-      ds6_cv_gai_ai_v4mapped=no
-    ])
+AC_DEFUN([WGET_STRUCT_SOCKADDR_STORAGE],[
+  AC_CHECK_TYPES([struct sockaddr_storage],[], [], [
+#include <sys/types.h>
+#include <sys/socket.h>
   ])
-
-  if test "X$ds6_cv_gai_ai_v4mapped" = "Xyes"; then :
-    $1
-  else :
-    $2
-  fi
 ])
 
 dnl ************************************************************