From: Bruno Haible Date: Thu, 8 Feb 2001 13:29:26 +0000 (+0000) Subject: Interoperability with newest CVS version of autoconf. X-Git-Tag: v0.10.36~151 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fed85a2b75ef9d08136150b44b8e54e96fa19e1;p=thirdparty%2Fgettext.git Interoperability with newest CVS version of autoconf. --- diff --git a/m4/ChangeLog b/m4/ChangeLog index 27a3af15e..19d470537 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,18 @@ +2001-02-07 Pavel Roskin + + * c-bs-a.m4: Quote first argument of AC_DEFUN. + * codeset.m4: Likewise. + * gettext.m4: Likewise. + * iconv.m4: Likewise. + * inttypes_h.m4: Likewise. + * isc-posix.m4: Likewise. + * lcmessage.m4: Likewise. + * libtool.m4: Likewise. + * progtest.m4: Likewise. + * setlocale.m4: Likewise. + * uintmax_t.m4: Likewise. + * ulonglong.m4: Likewise. + 2001-01-21 Bruno Haible Use libtool. diff --git a/m4/c-bs-a.m4 b/m4/c-bs-a.m4 index d9e6e11e8..6c54a5183 100644 --- a/m4/c-bs-a.m4 +++ b/m4/c-bs-a.m4 @@ -2,7 +2,7 @@ dnl From Paul Eggert. -AC_DEFUN(AC_C_BACKSLASH_A, +AC_DEFUN([AC_C_BACKSLASH_A], [ AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a, [AC_TRY_COMPILE([], diff --git a/m4/codeset.m4 b/m4/codeset.m4 index 8e8e3ec85..863c9cfa7 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -2,7 +2,7 @@ dnl From Bruno Haible. -AC_DEFUN(AM_LANGINFO_CODESET, +AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, [AC_TRY_LINK([#include ], diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 18aef6c6e..73c432e6d 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -33,7 +33,7 @@ dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl -AC_DEFUN(AM_WITH_NLS, +AC_DEFUN([AM_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -186,7 +186,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr], ]) dnl Usage: Just like AM_WITH_NLS, which see. -AC_DEFUN(AM_GNU_GETTEXT, +AC_DEFUN([AM_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl diff --git a/m4/iconv.m4 b/m4/iconv.m4 index eb9f765d6..c4a50c21a 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -2,7 +2,7 @@ dnl From Bruno Haible. -AC_DEFUN(AM_ICONV, +AC_DEFUN([AM_ICONV], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable libiconv installed). diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 750639d6f..6b046bb19 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -5,7 +5,7 @@ dnl From Paul Eggert. # Define HAVE_INTTYPES_H if exists, # doesn't clash with , and declares uintmax_t. -AC_DEFUN(jm_AC_HEADER_INTTYPES_H, +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], [ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, [AC_TRY_COMPILE( diff --git a/m4/isc-posix.m4 b/m4/isc-posix.m4 index f228ea816..99c899ce5 100644 --- a/m4/isc-posix.m4 +++ b/m4/isc-posix.m4 @@ -9,7 +9,7 @@ undefine([AC_ISC_POSIX]) -AC_DEFUN(AC_ISC_POSIX, +AC_DEFUN([AC_ISC_POSIX], [ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 index 0a354f787..929b51f07 100644 --- a/m4/lcmessage.m4 +++ b/m4/lcmessage.m4 @@ -8,7 +8,7 @@ # serial 2 -AC_DEFUN(AM_LC_MESSAGES, +AC_DEFUN([AM_LC_MESSAGES], [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [return LC_MESSAGES], diff --git a/m4/libtool.m4 b/m4/libtool.m4 index c41d84aa4..49f176c1c 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -22,7 +22,7 @@ ## the same distribution terms that you use for the rest of that program. # serial 40 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL, +AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl # Save cache, so that ltconfig can load it @@ -52,7 +52,7 @@ AC_SUBST(LIBTOOL)dnl exec 5>>./config.log ]) -AC_DEFUN(AC_LIBTOOL_SETUP, +AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.13)dnl AC_REQUIRE([AC_ENABLE_SHARED])dnl AC_REQUIRE([AC_ENABLE_STATIC])dnl @@ -132,16 +132,16 @@ esac ]) # AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) +AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) +AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) # AC_ENABLE_SHARED - implement the --enable-shared flag # Usage: AC_ENABLE_SHARED[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_SHARED, [dnl +AC_DEFUN([AC_ENABLE_SHARED], [dnl define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl @@ -167,14 +167,14 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl ]) # AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no)]) # AC_ENABLE_STATIC - implement the --enable-static flag # Usage: AC_ENABLE_STATIC[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_STATIC, [dnl +AC_DEFUN([AC_ENABLE_STATIC], [dnl define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl @@ -200,7 +200,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl ]) # AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_STATIC(no)]) @@ -208,7 +208,7 @@ AC_ENABLE_STATIC(no)]) # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl +AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(fast-install, changequote(<<, >>)dnl @@ -234,11 +234,11 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl ]) # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_FAST_INSTALL(no)]) # AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AC_PROG_LD, +AC_DEFUN([AC_PROG_LD], [AC_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) @@ -308,7 +308,7 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_PROG_LD_GNU ]) -AC_DEFUN(AC_PROG_LD_GNU, +AC_DEFUN([AC_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 &5; then @@ -319,7 +319,7 @@ fi]) ]) # AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AC_PROG_NM, +AC_DEFUN([AC_PROG_NM], [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(ac_cv_path_NM, [if test -n "$NM"; then @@ -353,7 +353,7 @@ AC_MSG_RESULT([$NM]) ]) # AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, +AC_DEFUN([AC_CHECK_LIBM], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case "$lt_target" in @@ -380,7 +380,7 @@ esac # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes @@ -401,7 +401,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_CHECK_LIB(ltdl, main, [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], [if test x"$enable_ltdl_install" = xno; then @@ -422,13 +422,13 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ]) dnl old names -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl +AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl +AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl +AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl +AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl +AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl +AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl +AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl dnl This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL])dnl diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 2482d4a9b..aa3c21809 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -10,7 +10,7 @@ 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/m4/setlocale.m4 b/m4/setlocale.m4 index ad183107f..a05624dfc 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -2,7 +2,7 @@ # Check for setlocale declaration. -AC_DEFUN(gt_SETLOCALE,[ +AC_DEFUN([gt_SETLOCALE],[ AC_CHECK_HEADERS([locale.h]) AC_MSG_CHECKING([for setlocale declaration]) AC_CACHE_VAL(gt_cv_proto_setlocale, [ diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 index 27045387d..470b81660 100644 --- a/m4/uintmax_t.m4 +++ b/m4/uintmax_t.m4 @@ -7,7 +7,7 @@ AC_PREREQ(2.13) # Define uintmax_t to `unsigned long' or `unsigned long long' # if does not exist. -AC_DEFUN(jm_AC_TYPE_UINTMAX_T, +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], [ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) if test $jm_ac_cv_header_inttypes_h = no; then diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4 index e2fbb5526..51fc41814 100644 --- a/m4/ulonglong.m4 +++ b/m4/ulonglong.m4 @@ -2,7 +2,7 @@ dnl From Paul Eggert. -AC_DEFUN(jm_AC_TYPE_UNSIGNED_LONG_LONG, +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],