[svn] Updated options news and the IPv6 changes news.

[wget] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index a4535c245173ffbe24e5f27e341b9add308cd4d1..d71269ac3e0fb84940455392d885901c4d3a1c41 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,17 +2,17 @@ dnl
 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)
-      AC_MSG_RESULT(yes)],
-    AC_MSG_RESULT(no))
-else
-  AC_MSG_RESULT(no)
-fi])
+AC_DEFUN([WGET_STRUCT_UTIMBUF], [
+  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
+  ])
+])
 
 
 dnl Check for socklen_t.  The third argument of accept, getsockname,
@@ -23,23 +23,23 @@ 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(yes)], [
-      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)
+      AC_DEFINE([socklen_t], [size_t],
+                [Define to int or size_t on systems without socklen_t.])
     ], [
       AC_MSG_RESULT(int)
-      AC_DEFINE(socklen_t, int)
+      AC_DEFINE([socklen_t], [int],
+                [Define to int or size_t on systems without socklen_t.])
     ])
   ])
 ])
@@ -51,11 +51,12 @@ dnl even on those because Apache installs its own fnmatch.h to
 dnl /usr/local/include (!), which GCC uses before /usr/include.
 
 AC_DEFUN([WGET_FNMATCH], [
-  AC_MSG_CHECKING([whether fnmatch.h can be included])
+  AC_MSG_CHECKING([for working fnmatch.h])
   AC_COMPILE_IFELSE([#include <fnmatch.h>
                     ], [
     AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_FNMATCH_H)
+    AC_DEFINE([HAVE_WORKING_FNMATCH_H], 1,
+              [Define if fnmatch.h can be included.])
   ], [
     AC_MSG_RESULT(no)
   ])
@@ -67,11 +68,13 @@ dnl link with -lt (recently) or with -lposix (older releases).
 AC_DEFUN([WGET_NANOSLEEP], [
   AC_CHECK_FUNCS(nanosleep, [], [
     AC_CHECK_LIB(rt, nanosleep, [
-      AC_DEFINE(HAVE_NANOSLEEP)
+      AC_DEFINE([HAVE_NANOSLEEP], 1,
+                [Define if you have the nanosleep function.])
       LIBS="-lrt $LIBS"
     ], [
       AC_CHECK_LIB(posix4, nanosleep, [
-       AC_DEFINE(HAVE_NANOSLEEP)
+       AC_DEFINE([HAVE_NANOSLEEP], 1,
+                 [Define if you have the nanosleep function.])
        LIBS="-lposix4 $LIBS"
       ])
     ])
@@ -102,30 +105,6 @@ AC_DEFUN([WGET_NSL_SOCKET], [
 ])
 
 
-dnl
-dnl ansi2knr support: check whether C prototypes are available.
-dnl
-
-AC_DEFUN(AM_C_PROTOTYPES,
-[AC_REQUIRE([AM_PROG_CC_STDC])
-AC_BEFORE([$0], [AC_C_INLINE])
-AC_MSG_CHECKING([for function prototypes])
-if test "$am_cv_prog_cc_stdc" != no; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(PROTOTYPES)
-  U= ANSI2KNR=
-else
-  AC_MSG_RESULT(no)
-  U=_ ANSI2KNR=./ansi2knr
-  # Ensure some checks needed by ansi2knr itself.
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h)
-fi
-AC_SUBST(U)dnl
-AC_SUBST(ANSI2KNR)dnl
-])
-
-
 # serial 1
 
 # @defmac AC_PROG_CC_STDC
@@ -335,7 +314,7 @@ dnl ************************************************************
 \f
 # This code originates from Ulrich Drepper's AM_WITH_NLS.
 
-AC_DEFUN(WGET_WITH_NLS,
+AC_DEFUN([WGET_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -348,7 +327,21 @@ AC_DEFUN(WGET_WITH_NLS,
     dnl last moment.
 
     if test x"$HAVE_NLS" = xyes; then
-      AC_MSG_RESULT([language catalogs: $ALL_LINGUAS])
+      dnl If LINGUAS is specified, use only those languages.  In fact,
+      dnl compute an intersection of languages in LINGUAS and
+      dnl ALL_LINGUAS, and use that.
+      if test x"$LINGUAS" != x; then
+        new_linguas=
+        for lang1 in $ALL_LINGUAS; do
+          for lang2 in $LINGUAS; do
+            if test "$lang1" = "$lang2"; then
+              new_linguas="$new_linguas $lang1"
+            fi
+          done
+        done
+        ALL_LINGUAS=$new_linguas
+      fi
+      AC_MSG_NOTICE([language catalogs: $ALL_LINGUAS])
       AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
       AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
@@ -383,7 +376,8 @@ AC_DEFUN(WGET_WITH_NLS,
       AC_CHECK_LIB(intl, gettext, [
         dnl gettext is in libintl; announce the fact manually.
         LIBS="-lintl $LIBS"
-       AC_DEFINE(HAVE_GETTEXT)
+       AC_DEFINE([HAVE_GETTEXT], 1,
+                  [Define if you have the gettext function.])
       ], [
         AC_CHECK_FUNCS(gettext, [], [
           AC_MSG_RESULT([gettext not found; disabling NLS])
@@ -391,9 +385,6 @@ AC_DEFUN(WGET_WITH_NLS,
         ])
       ])
 
-      dnl These rules are solely for the distribution goal.  While doing this
-      dnl we only have to keep exactly one list of the available catalogs
-      dnl in configure.in.
       for lang in $ALL_LINGUAS; do
        GMOFILES="$GMOFILES $lang.gmo"
        POFILES="$POFILES $lang.po"
@@ -418,7 +409,7 @@ AC_DEFUN(WGET_WITH_NLS,
     USE_NLS=$HAVE_NLS
     AC_SUBST(USE_NLS)
     if test "x$HAVE_NLS" = xyes; then
-      AC_DEFINE(HAVE_NLS)
+      AC_DEFINE([HAVE_NLS], 1, [Define this if you want the NLS support.])
     fi
   ])