* acgeneral.m4 (AC_SHELL_DIRNAME): The sed fall back was producing

twice the output for it was not using `-n' and used `p'.  Remove
the latter.

diff --git a/ChangeLog b/ChangeLog
index b65884345bbe43616b5c812251c5641c8ddd4234..14155e0acd37aa69b315e2f3ed72f807aeb89c92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-25  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_SHELL_DIRNAME): The sed fall back was producing
+       twice the output for it was not using `-n' and used `p'.  Remove
+       the latter.
+
 2000-10-25  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_INIT_PREPARE_FDS): Give some information on

diff --git a/acgeneral.m4 b/acgeneral.m4
index c9d6fb40d7bca5665bf2efc23e13c0ca2f163d69..684e5470089356bce1efd85da60f6d01aef90323 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -927,11 +927,11 @@ define([AC_SHELL_DIRNAME],
       X[]$1 : 'X\(/\)' \| \
       .   : '\(.\)' 2>/dev/null ||
 echo "X[]$1" |
-    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
-         /^X\(\/\/\)$/{ s//\1/p; q; }
-         /^X\(\/\).*/{ s//\1/p; q; }
-         s/.*/./p; q']])
+    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q']])
 
 
 ## --------------------------------------------------- ##

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c9d6fb40d7bca5665bf2efc23e13c0ca2f163d69..684e5470089356bce1efd85da60f6d01aef90323 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -927,11 +927,11 @@ define([AC_SHELL_DIRNAME],
       X[]$1 : 'X\(/\)' \| \
       .   : '\(.\)' 2>/dev/null ||
 echo "X[]$1" |
-    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
-         /^X\(\/\/\)$/{ s//\1/p; q; }
-         /^X\(\/\).*/{ s//\1/p; q; }
-         s/.*/./p; q']])
+    sed ['/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q']])
 
 
 ## --------------------------------------------------- ##