From: Bruno Haible Date: Tue, 18 Feb 2003 13:07:35 +0000 (+0000) Subject: Workaround autoconf >= 2.52 breakage. X-Git-Tag: v0.12~216 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c05e618aebfe3a501c9fc8675432594842b507ed;p=thirdparty%2Fgettext.git Workaround autoconf >= 2.52 breakage. --- diff --git a/ChangeLog b/ChangeLog index fbdaaf8d8..cec4bd457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-02-16 Bruno Haible + + Workaround autoconf >= 2.52 breakage. + * config/m4/libtool.m4 (AC_LIBTOOL_ARG_WITH): New macro. + (_LT_AC_LTCONFIG_HACK, AC_PROG_LD): Use it. + 2003-02-12 Bruno Haible Big restructuring. diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog new file mode 100644 index 000000000..70a579b12 --- /dev/null +++ b/autoconf-lib-link/m4/ChangeLog @@ -0,0 +1,9 @@ +2003-02-16 Bruno Haible + + Workaround autoconf >= 2.52 breakage. + * lib-prefix.m4 (AC_LIB_ARG_WITH): New macro. + (AC_LIB_PREFIX): Use it instead of AC_ARG_WITH. + * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Likewise. + + +See ../../gettext-tools/m4/ChangeLog.0 for earlier changes. diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4 index 6b9425105..83686d83a 100644 --- a/autoconf-lib-link/m4/lib-link.m4 +++ b/autoconf-lib-link/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-link.m4 serial 4 (gettext-0.11.6) +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 dnl Public License, this file may be distributed as part of a program @@ -135,7 +135,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib$1-prefix], + AC_LIB_ARG_WITH([lib$1-prefix], [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib --without-lib$1-prefix don't search for lib$1 in includedir and libdir], [ diff --git a/autoconf-lib-link/m4/lib-prefix.m4 b/autoconf-lib-link/m4/lib-prefix.m4 index b8b79ab9a..c6234d4ec 100644 --- a/autoconf-lib-link/m4/lib-prefix.m4 +++ b/autoconf-lib-link/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-prefix.m4 serial 2 (gettext-0.11.6) +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 dnl Public License, this file may be distributed as part of a program @@ -8,6 +8,13 @@ dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +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])])]) + 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 dnl a user will want packages to use other packages he previously installed @@ -26,7 +33,7 @@ AC_DEFUN([AC_LIB_PREFIX], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib-prefix], + AC_LIB_ARG_WITH([lib-prefix], [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib --without-lib-prefix don't search for libraries in includedir and libdir], [ diff --git a/config/m4/libtool.m4 b/config/m4/libtool.m4 index 18a8e2d05..29aa7d5fc 100644 --- a/config/m4/libtool.m4 +++ b/config/m4/libtool.m4 @@ -836,7 +836,7 @@ AC_MSG_RESULT($objdir) ## FIXME: this should be a separate macro ## -AC_ARG_WITH(pic, +AC_LIBTOOL_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default @@ -3238,7 +3238,7 @@ fi # AC_PROG_LD - find the path to the GNU or non-GNU linker AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH(gnu-ld, +[AC_LIBTOOL_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl @@ -3630,6 +3630,13 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], INCLTDL="$LTDLINCL" ]) +dnl AC_LIBTOOL_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +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_LIBTOOL_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_LIBTOOL_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + # old names AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])