Avoid an error with an outdated version of automake.

diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog
index 8e1bc8e48397125146f1790de60e96ff475af4b2..80db5485b249f41f42ae3e858e6e5ae5852cca25 100644 (file)
--- a/autoconf-lib-link/m4/ChangeLog
+++ b/autoconf-lib-link/m4/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-01  Bruno Haible  <bruno@clisp.org>
+
+       * lib-prefix.m4 (AC_LIB_ARG_WITH): Avoid "duplicated macro" error from
+       aclocal-1.4-p4.
+       Reported by Luke Schierer <lschiere@rackspace.com> and
+       Michael C. Toren <mct@toren.net>.
+
 2003-06-17  Paul Eggert  <eggert@twinsun.com>
 
        * lib-ld.m4 (AC_LIB_PROG_LD_GNU, AC_LIB_PROG_LD): Don't use egrep, for

diff --git a/autoconf-lib-link/m4/lib-prefix.m4 b/autoconf-lib-link/m4/lib-prefix.m4
index c719bc809002e3e5828d132eb66478f5787252e3..26874b267d7e2dd94857e71e97aea5ac49402281 100644 (file)
--- a/autoconf-lib-link/m4/lib-prefix.m4
+++ b/autoconf-lib-link/m4/lib-prefix.m4
@@ -1,4 +1,4 @@
-# lib-prefix.m4 serial 2 (gettext-0.12)
+# lib-prefix.m4 serial 3 (gettext-0.12.2)
 dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -13,7 +13,7 @@ dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
 dnl require excessive bracketing.
 ifdef([AC_HELP_STRING],
 [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
 
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that