Do not use Autoconf internals.

* tests/dirname.test: Don't use AC_PLAIN_SCRIPT.
* m4/header.m4 (_AM_DIRNAME): Use regexp and patsubst, not
m4_regexp and m4_patsubst, since the latter are reserved for ERE
macro in GNU M4 1.5.

diff --git a/ChangeLog b/ChangeLog
index 209cc89da44f5142b1bd94f1ba91c1e745671b7c..cf0d5d9bcd37d1c7a2ae6e0f9f99938f618718d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-09  Akim Demaille  <akim@epita.fr>
+
+       Do not use Autoconf internals.
+
+       * tests/dirname.test: Don't use AC_PLAIN_SCRIPT.
+       * m4/header.m4 (_AM_DIRNAME): Use regexp and patsubst, not
+       m4_regexp and m4_patsubst, since the latter are reserved for ERE
+       macro in GNU M4 1.5.
+
 2001-10-08  Akim Demaille  <akim@epita.fr>
 
        * m4/cond.m4 (AM_CONDITIONAL): Don't use m4_match as Autoconf

diff --git a/m4/header.m4 b/m4/header.m4
index a29f0d950f78a75c30541744bc40975d4434d0ed..c79672ee6c9232471dcf112c6bc293c41b2f521f 100644 (file)
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -47,11 +47,11 @@ echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_In
 # -----------------
 # Like AS_DIRNAME, only do it during macro expansion
 AC_DEFUN([_AM_DIRNAME],
-       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-             m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
-                   m4_if(m4_regexp([$1], [^/.*]), -1,
+       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+             m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+                   m4_if(regexp([$1], [^/.*]), -1,
                          [.],
-                         m4_patsubst([$1], [^\(/\).*], [\1])),
-                   m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-             m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+                         patsubst([$1], [^\(/\).*], [\1])),
+                   patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+             patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
 ]) # _AM_DIRNAME

diff --git a/tests/dirname.test b/tests/dirname.test
index bbc5de7f89298eed8795158d8ede0b2bbbbed547..79712926357e39c51067cc112fce268e2d26a40f 100755 (executable)
--- a/tests/dirname.test
+++ b/tests/dirname.test
@@ -5,7 +5,7 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-AC_PLAIN_SCRIPT
+AC_INIT
 echo "1 /a/path/to/a/file      = _AM_DIRNAME([/a/path/to/a/file])"
 echo "2 another/path/to/a/file = _AM_DIRNAME([another/path/to/a/file])"
 echo "3 file                   = _AM_DIRNAME([file])"
@@ -19,11 +19,8 @@ END
 $needs_autoconf
 
 $ACLOCAL || exit 1
-$AUTOCONF || exit 1
-
-# fail gracefully if autoconf didn't support AC_PLAIN_SCRIPT, because it won't
-# support our regexps anyhow
-test -s configure || exit 77
+# fail gracefully if autoconf didn't support support our regexps anyhow
+$AUTOCONF || exit 77
 
 $SHELL ./configure >got || exit 1
 
@@ -40,4 +37,3 @@ EOF
 diff wanted got || exit 1
 
 exit 0
-