Use new documented autoconf macros.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 1276baa8c7c0f9afd9fc14024ad7e4f40d02213a..b312a27ea2b7c0441f48b210a3dad8e89fc1d2c8 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,8 +1,13 @@
-2003-03-17  Bruno Haible  <bruno@clisp.org>
+2003-03-18  Bruno Haible  <bruno@clisp.org>
 
+       * onceonly.m4: Use m4_defn instead of defn, for better error checking.
        * onceonly_2_57.m4: Likewise.
+
+2003-03-17  Bruno Haible  <bruno@clisp.org>
+
        * onceonly.m4: Require autoconf 2.54 or newer.
        (m4_quote): Remove macro.
+       * onceonly_2_57.m4: Require autoconf 2.54 or newer.
 
 2003-03-14  Bruno Haible  <bruno@clisp.org>
 

diff --git a/m4/onceonly.m4 b/m4/onceonly.m4
index f6fec37cbf25011a685f4ddcd2005c74a05c94f0..4ab8fd0ed6872a5c67933f5a9d9a0fb22ac8d821 100644 (file)
--- a/m4/onceonly.m4
+++ b/m4/onceonly.m4
@@ -29,7 +29,7 @@ AC_PREREQ(2.54)
 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_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]),
                                                  [-./], [___])), [
       AC_CHECK_HEADERS(gl_HEADER_NAME)
     ])
@@ -43,10 +43,10 @@ AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
 AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
   :
   AC_FOREACH([gl_FUNC_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
-      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME]))
     ])
-    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
   ])
 ])
 
@@ -55,9 +55,9 @@ AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
 AC_DEFUN([AC_CHECK_DECLS_ONCE], [
   :
   AC_FOREACH([gl_DECL_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
-      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
     ])
-    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
   ])
 ])

diff --git a/m4/onceonly_2_57.m4 b/m4/onceonly_2_57.m4
index 18be5b7483ed68d207b46e43a22831267032ba8e..9fc510e06ee1fcc86163ffdb4c47389b6e7ea7f7 100644 (file)
--- a/m4/onceonly_2_57.m4
+++ b/m4/onceonly_2_57.m4
@@ -39,8 +39,8 @@ AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
       m4_divert_text([INIT_PREPARE],
         [gl_header_list="$gl_header_list gl_HEADER_NAME"])
       gl_HEADERS_EXPANSION
-      AH_TEMPLATE(AS_TR_CPP([HAVE_]defn([gl_HEADER_NAME])),
-        [Define to 1 if you have the <]defn([gl_HEADER_NAME])[> header file.])
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
     ])
     AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
                                                    [./-], [___])))
@@ -57,14 +57,14 @@ m4_define([gl_HEADERS_EXPANSION], [
 AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
   :
   AC_FOREACH([gl_FUNC_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
       m4_divert_text([INIT_PREPARE],
         [gl_func_list="$gl_func_list gl_FUNC_NAME"])
       gl_FUNCS_EXPANSION
-      AH_TEMPLATE(AS_TR_CPP([HAVE_]defn([gl_FUNC_NAME])),
-        [Define to 1 if you have the `]defn([gl_FUNC_NAME])[' function.])
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
     ])
-    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
   ])
 ])
 m4_define([gl_FUNCS_EXPANSION], [
@@ -78,9 +78,9 @@ m4_define([gl_FUNCS_EXPANSION], [
 AC_DEFUN([AC_CHECK_DECLS_ONCE], [
   :
   AC_FOREACH([gl_DECL_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
-      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
     ])
-    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
   ])
 ])