[svn] Fix #20736: wget.m4 adjustments (m4 quotation)

Also, fixed " <at> " to "@" in attribution for fix of #20735.

diff --git a/ChangeLog b/ChangeLog
index 6d9a5ac33ffa78edcf1af0d6550cc6ffde5798e8..fd13f43a9130b99e44bb607431986d54b47b7e6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/wget.m4 (WGET_PROCESS_PO, AM_PATH_PROG_WITH_TEST): Add
+       missing M4 quotation.  Delete serial number.
+
 2007-08-08  Micah Cowan  <micah@cowan.name>
 
        * NEWS: Call attention to the fact that Content-Disposition is

diff --git a/m4/wget.m4 b/m4/wget.m4
index e856fe59d85d5d3eb454824d9b616ac63bfd165c..2dc8b34815f73daee4a6939fa6964909a175fffb 100644 (file)
--- a/m4/wget.m4
+++ b/m4/wget.m4
@@ -1,5 +1,5 @@
 dnl Wget-specific Autoconf macros.
-dnl Copyright (C) 1996-2005 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2005, 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
@@ -332,7 +332,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.
-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
@@ -364,11 +364,9 @@ AC_DEFUN(WGET_PROCESS_PO,
 # 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]])
-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])

diff --git a/src/ChangeLog b/src/ChangeLog
index b283487ea5bf4a63a61f400ef5abbad1a04c0152..d6909aa7da7e844b0a1e6b7c0876241500d889d2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2007-08-09  Ralf Wildenhues  <Ralf.Wildenhues <at> gmx.de>
+2007-08-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * src/url.c (url_string): Use comparison, not assignment, in
        check for auth_mode == URL_AUTH_HIDE_PASSWD.