round: Update regarding AIX.

[gnulib.git] / m4 / canonicalize.m4

diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 47c5c01..d418de8 100644 (file)
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,6 +1,6 @@
-# canonicalize.m4 serial 15
+# canonicalize.m4 serial 16
 
-dnl Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,10 +14,11 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
 
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
+  AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
-  elif test $gl_cv_func_realpath_works != yes; then
+  elif test "$gl_cv_func_realpath_works" != yes; then
     REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 ])
@@ -31,10 +32,10 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
     AC_LIBOBJ([canonicalize-lgpl])
     if test $ac_cv_func_realpath = no; then
       HAVE_REALPATH=0
-    elif test $gl_cv_func_realpath_works != yes; then
+    elif test "$gl_cv_func_realpath_works" != yes; then
       REPLACE_REALPATH=1
     fi
-  elif test $gl_cv_func_realpath_works != yes; then
+  elif test "$gl_cv_func_realpath_works" != yes; then
     AC_LIBOBJ([canonicalize-lgpl])
     REPLACE_REALPATH=1
     REPLACE_CANONICALIZE_FILE_NAME=1
@@ -47,6 +48,7 @@ AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE],
 [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS_ONCE([canonicalize_file_name getcwd readlink])
+  AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
   AC_CHECK_HEADERS_ONCE([sys/param.h])
 ])
@@ -71,7 +73,7 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
     ], [gl_cv_func_realpath_works=yes], [gl_cv_func_realpath_works=no],
        [gl_cv_func_realpath_works="guessing no"])
   ])
-  if test $gl_cv_func_realpath_works = yes; then
+  if test "$gl_cv_func_realpath_works" = yes; then
     AC_DEFINE([FUNC_REALPATH_WORKS], [1], [Define to 1 if realpath()
       can malloc memory, always gives an absolute path, and handles
       trailing slash correctly.])