Require autoconf 2.54 or newer.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 9b1ef3dbe5279cab238c425cc68e4ef17dec8f94..1276baa8c7c0f9afd9fc14024ad7e4f40d02213a 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-17  Bruno Haible  <bruno@clisp.org>
+
+       * onceonly_2_57.m4: Likewise.
+       * onceonly.m4: Require autoconf 2.54 or newer.
+       (m4_quote): Remove macro.
+
 2003-03-14  Bruno Haible  <bruno@clisp.org>
 
        * onceonly_2_57.m4 (AC_CHECK_HEADERS_ONCE, AC_CHECK_FUNCS_ONCE,

diff --git a/m4/onceonly.m4 b/m4/onceonly.m4
index af56aa94484661e3adc151f26b52c77eb1a07606..f6fec37cbf25011a685f4ddcd2005c74a05c94f0 100644 (file)
--- a/m4/onceonly.m4
+++ b/m4/onceonly.m4
@@ -1,4 +1,4 @@
-# onceonly.m4 serial 2
+# onceonly.m4 serial 3
 dnl Copyright (C) 2002, 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
@@ -21,8 +21,8 @@ dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
 dnl empty, and the check will be inserted before the body of the AC_DEFUNed
 dnl function.
 
-dnl Taken from Autoconf 2.50; can be removed once we assume 2.50 or later.
-define([m4_quote], [[$*]])
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
 
 # AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
 # AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
@@ -30,11 +30,11 @@ AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
   :
   AC_FOREACH([gl_HEADER_NAME], [$1], [
     AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
-                                                [-./], [___])), [
+                                                 [-./], [___])), [
       AC_CHECK_HEADERS(gl_HEADER_NAME)
     ])
     AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-                                                  [-./], [___])))
+                                                   [-./], [___])))
   ])
 ])
 

diff --git a/m4/onceonly_2_57.m4 b/m4/onceonly_2_57.m4
index 385d7cacc72fa1a621518b427b8d439e7565b7d9..18be5b7483ed68d207b46e43a22831267032ba8e 100644 (file)
--- a/m4/onceonly_2_57.m4
+++ b/m4/onceonly_2_57.m4
@@ -1,4 +1,4 @@
-# onceonly_2_57.m4 serial 2
+# onceonly_2_57.m4 serial 3
 dnl Copyright (C) 2002-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
@@ -26,6 +26,9 @@ dnl DEFAULTS and INIT_PREPARE in order to check all requested headers at once,
 dnl thus reducing the size of 'configure'. Works with autoconf-2.57. The
 dnl size reduction is ca. 9%.
 
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
 # AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
 # AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
 AC_DEFUN([AC_CHECK_HEADERS_ONCE], [