From: Bruno Haible Date: Tue, 1 Jul 2003 11:15:19 +0000 (+0000) Subject: Avoid an error with an outdated version of automake. X-Git-Tag: v0.13~400 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2427b0fe0e8e9d6068dd8dc2d5e9894f21dbe62;p=thirdparty%2Fgettext.git Avoid an error with an outdated version of automake. --- diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog index 8e1bc8e48..80db5485b 100644 --- a/autoconf-lib-link/m4/ChangeLog +++ b/autoconf-lib-link/m4/ChangeLog @@ -1,3 +1,10 @@ +2003-07-01 Bruno Haible + + * lib-prefix.m4 (AC_LIB_ARG_WITH): Avoid "duplicated macro" error from + aclocal-1.4-p4. + Reported by Luke Schierer and + Michael C. Toren . + 2003-06-17 Paul Eggert * 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 c719bc809..26874b267 100644 --- 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