Automated merge with file:/home/micah/devel/wget/eleven

[wget] / m4 / wget.m4

diff --git a/m4/wget.m4 b/m4/wget.m4
index c115de7516368db188fd37f152d725a90420d9ae..736bd2eb3e13baa6a03517439afcaca021e55f90 100644 (file)
--- a/m4/wget.m4
+++ b/m4/wget.m4
@@ -1,9 +1,10 @@
 dnl Wget-specific Autoconf macros.
 dnl Wget-specific Autoconf macros.

-dnl Copyright (C) 1996-2005 Free Software Foundation, Inc.
+dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+dnl 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by

-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or

 dnl (at your option) any later version.
 
 dnl This program is distributed in the hope that it will be useful,
 dnl (at your option) any later version.
 
 dnl This program is distributed in the hope that it will be useful,


@@ -12,8 +13,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 dnl You should have received a copy of the GNU General Public License
 dnl GNU General Public License for more details.
 
 dnl You should have received a copy of the GNU General Public License

-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 dnl In addition, as a special exception, the Free Software Foundation
 dnl gives permission to link the code of its release of Wget with the
 
 dnl In addition, as a special exception, the Free Software Foundation
 dnl gives permission to link the code of its release of Wget with the


@@ -279,7 +279,7 @@ AC_DEFUN([WGET_WITH_NLS],
        fi
       fi
 
        fi
       fi
 

-      AC_CHECK_HEADERS(locale.h libintl.h)
+      AC_CHECK_HEADERS(libintl.h)

 
       dnl Prefer gettext found in -lintl to the one in libc.
       dnl Otherwise it can happen that we include libintl.h from
 
       dnl Prefer gettext found in -lintl to the one in libc.
       dnl Otherwise it can happen that we include libintl.h from


@@ -333,7 +333,7 @@ dnl
 dnl This is not strictly an Autoconf macro, because it is run from
 dnl within `config.status' rather than from within configure.  This
 dnl is why special rules must be applied for it.
 dnl This is not strictly an Autoconf macro, because it is run from
 dnl within `config.status' rather than from within configure.  This
 dnl is why special rules must be applied for it.

-AC_DEFUN(WGET_PROCESS_PO,
+AC_DEFUN([WGET_PROCESS_PO],

   [
    dnl I wonder what the following several lines do...
    if test "x$srcdir" != "x."; then
   [
    dnl I wonder what the following several lines do...
    if test "x$srcdir" != "x."; then


@@ -365,11 +365,9 @@ AC_DEFUN(WGET_PROCESS_PO,
 # functionality.  Please note that the actual code is *not* freely
 # available.
 
 # functionality.  Please note that the actual code is *not* freely
 # available.
 

-# serial 1
-

 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])

-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],

 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])