_AS_DIRNAME_PREPARE

diff --git a/ChangeLog b/ChangeLog
index a42b1e7f49b0c3b6ac9d7fee825c545986082c46..6d79a81a1ab1fbdbf9c66ed0ce383343fbcf0b39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-01  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/m4sugar/m4sh.m4 (_AS_DIRNAME_PREPARE): New macro.
+       (AS_DIRNAME): Use it.
+
 2006-04-01  Eric Blake  <ebb9@byu.net>
 
        * lib/m4sugar/m4sh.m4 (_AS_PATH_WALK): Optimize nonexistent

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 2c40e646a8785800c80a81a6a5f94b08776fe503..efb1518eb86f997b123e649d73e78ce3630ad8f3 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -743,11 +743,23 @@ m4_defun([AS_DIRNAME_SED],
          s/.*/./; q']])
 
 m4_defun([AS_DIRNAME],
-[(dirname $1) 2>/dev/null ||
+[AS_REQUIRE([_$0_PREPARE])dnl
+$as_dirname $1 ||
 AS_DIRNAME_EXPR([$1]) 2>/dev/null ||
 AS_DIRNAME_SED([$1])])
 
 
+# _AS_DIRNAME_PREPARE
+# --------------------
+m4_defun([_AS_DIRNAME_PREPARE],
+[if (dirname /) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+])# _AS_DIRNAME_PREPARE
+
+
 # AS_EXECUTABLE_P
 # ---------------
 # Check whether a file is executable.