X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdouble-slash-root.m4;h=16a4e3ec9e6c620837a4c990a719ddf18f8cd173;hb=5bf73fbe89c75118e5e9a53e4b88a57729d26964;hp=69d60d011e48e43a9858839e7161b3a9cb084c43;hpb=f3e4befcd28d79d1186083f4ec5513dfd5b0f395;p=gnulib.git

diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4
index 69d60d011..16a4e3ec9 100644
--- a/m4/double-slash-root.m4
+++ b/m4/double-slash-root.m4
@@ -1,5 +1,5 @@
-# double-slash-root.m4 serial 2   -*- Autoconf -*-
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# double-slash-root.m4 serial 4   -*- Autoconf -*-
+dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,30 +9,30 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([whether // is distinct from /], [gl_cv_double_slash_root],
     [ if test x"$cross_compiling" = xyes ; then
-	# When cross-compiling, there is no way to tell whether // is special
-	# short of a list of hosts.  However, the only known hosts to date
-	# that have a distinct // are Apollo DomainOS (too old to port to),
-	# Cygwin, and z/OS.  If anyone knows of another system for which // has
-	# special semantics and is distinct from /, please report it to
-	# <bug-gnulib@gnu.org>.
-	case $host in
-	  *-cygwin | i370-ibm-openedition)
-	    gl_cv_double_slash_root=yes ;;
-	  *)
-	    # Be optimistic and assume that / and // are the same when we
-	    # don't know.
-	    gl_cv_double_slash_root='unknown, assuming no' ;;
-	esac
+        # When cross-compiling, there is no way to tell whether // is special
+        # short of a list of hosts.  However, the only known hosts to date
+        # that have a distinct // are Apollo DomainOS (too old to port to),
+        # Cygwin, and z/OS.  If anyone knows of another system for which // has
+        # special semantics and is distinct from /, please report it to
+        # <bug-gnulib@gnu.org>.
+        case $host in
+          *-cygwin | i370-ibm-openedition)
+            gl_cv_double_slash_root=yes ;;
+          *)
+            # Be optimistic and assume that / and // are the same when we
+            # don't know.
+            gl_cv_double_slash_root='unknown, assuming no' ;;
+        esac
       else
-	set x `ls -di / //`
-	if test $[2] = $[4] && wc //dev/null >/dev/null 2>&1; then
-	  gl_cv_double_slash_root=no
-	else
-	  gl_cv_double_slash_root=yes
-	fi
+        set x `ls -di / // 2>/dev/null`
+        if test "$[2]" = "$[4]" && wc //dev/null >/dev/null 2>&1; then
+          gl_cv_double_slash_root=no
+        else
+          gl_cv_double_slash_root=yes
+        fi
       fi])
   if test "$gl_cv_double_slash_root" = yes; then
-    AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], 1,
+    AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], [1],
       [Define to 1 if // is a file system root distinct from /.])
   fi
 ])