* lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR): AS_REQUIRE, not

m4_require.

diff --git a/ChangeLog b/ChangeLog
index 1da4eb52ed06306eda7bb50bf92f2b18d0e8d7be..24297ecf27b06a0094d485ff4d2806a12c5f4dd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-12  Akim Demaille  <akim@epita.fr>
+
+       * lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR): AS_REQUIRE, not
+       m4_require.
+
 2002-03-11  Andreas Schwab  <schwab@suse.de>
 
        * configure.ac: Explicitly check for EMACS since AM_PATH_LISPDIR

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 8762f96f9e15c733f729b1ca9288a8c3ef73ae4a..79700f947f5b3524a4b7c4dc5e5fcf0cc68c4e93 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -99,7 +99,8 @@ m4_copy([_m4_divert(M4SH-INIT)], [_m4_divert(NOTICE)])
 # AS_REQUIRE(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK])
 # -----------------------------------------------------------
 # BODY-TO-EXPAND is some initialization which must be expanded in the
-# M4SH-INIT section when expanded (required or not).  For instance:
+# M4SH-INIT section when expanded (required or not).  This is very
+# different from m4_require.  For instance:
 #
 #      m4_defun([_FOO_PREPARE], [foo=foo])
 #      m4_defun([FOO],
@@ -416,7 +417,7 @@ AS_DIRNAME_SED([$1])])
 # Also see the comments for AS_DIRNAME.
 
 m4_defun([AS_BASENAME_EXPR],
-[m4_require([_AS_EXPR_PREPARE])dnl
+[AS_REQUIRE([_AS_EXPR_PREPARE])dnl
 $as_expr X/[]$1 : '.*/\([[^/][^/]*]\)/*$' \| \
         X[]$1 : 'X\(//\)$' \| \
         X[]$1 : 'X\(/\)$' \| \