* lib/m4sugar/m4sh.m4 (_AS_DIRNAME_PREPARE): Check whether

`dirname -- /' returns `/', for SunOS dirname scripts that escaped.
Report by Sam Sirlin <sam@kalessin.jpl.nasa.gov>.

diff --git a/ChangeLog b/ChangeLog
index 6d30f9acde8b479c477bc3597a99700d7ac21add..ad98eb3901a91e42dc9c321f4eee5c1d06740c93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/m4sugar/m4sh.m4 (_AS_DIRNAME_PREPARE): Check whether
+       `dirname -- /' returns `/', for SunOS dirname scripts that escaped.
+       Report by Sam Sirlin <sam@kalessin.jpl.nasa.gov>.
+
 2006-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/autoconf/general.m4: Revert AC_TRY_EVAL and AC_TRY_COMMAND,

diff --git a/configure b/configure
index 83d8cbf65a11b7123c84114144b0a0d6d45b67d5..90bfd823f7394d0282b5c0efbe26168f7e5418ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -459,7 +459,7 @@ test \$exitcode = 0") || {
 }
 
 
-if (dirname -- /) >/dev/null 2>&1; then
+if (as_dir=`dirname -- /` && test "$as_dir" = /) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
@@ -3138,7 +3138,7 @@ $as_unset CDPATH
 }
 
 
-if (dirname -- /) >/dev/null 2>&1; then
+if (as_dir=`dirname -- /` && test "$as_dir" = /) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 40e3d106c6e99bfe1af7f575ff73c770db4685b4..e37e68862b475dd64997e491706cb73ccf721a06 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -755,7 +755,7 @@ _AS_DIRNAME_SED([$1])])
 # _AS_DIRNAME_PREPARE
 # --------------------
 m4_defun([_AS_DIRNAME_PREPARE],
-[if (dirname -- /) >/dev/null 2>&1; then
+[if (as_dir=`dirname -- /` && test "$as_dir" = /) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false