From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 5 Apr 2006 08:01:04 +0000 (+0000)
Subject: * lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR):
X-Git-Tag: AUTOCONF-2.59c~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf298164fe7a0793460f98ef97e6b4e529c4d247;p=thirdparty%2Fautoconf.git

* lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR):
Use simplified args that Eric Blake originally suggested.
---

diff --git a/ChangeLog b/ChangeLog
index 699b53d67..b27a1f986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR):
+	Use simplified args that Eric Blake originally suggested.
+
 2006-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* tests/mktests.sh: Don't use 'cat'; just read the files directly.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index f0ca5934b..fec0089d2 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -666,8 +666,7 @@ m4_defun([AS_BASENAME_EXPR],
 [AS_REQUIRE([_AS_EXPR_PREPARE])dnl
 $as_expr X/[]$1 : '.*/\([[^/][^/]*]\)/*$' \| \
 	 X[]$1 : 'X\(//\)$' \| \
-	 X[]$1 : 'X\(/\)' \| \
-	 .     : '\(.\)'])
+	 X[]$1 : 'X\(/\)' \| .])
 
 m4_defun([AS_BASENAME_SED],
 [echo X/[]$1 |
@@ -720,8 +719,7 @@ m4_defun([AS_DIRNAME_EXPR],
 $as_expr X[]$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \
 	 X[]$1 : 'X\(//\)[[^/]]' \| \
 	 X[]$1 : 'X\(//\)$' \| \
-	 X[]$1 : 'X\(/\)' \| \
-	 .     : '\(.\)'])
+	 X[]$1 : 'X\(/\)' \| .])
 
 m4_defun([AS_DIRNAME_SED],
 [echo X[]$1 |