From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 7 Jul 2012 00:04:55 +0000 (+0200)
Subject: canonicalize[-lgpl]: handle "guessing" values when cross-building
X-Git-Tag: v0.1~553
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=62ab49df5452004ca708ca365685e6edfe352a97;p=gnulib.git

canonicalize[-lgpl]: handle "guessing" values when cross-building

* m4/canonicalize.m4 (gl_FUNC_CANONICALIZE_FILENAME_MODE)
(gl_CANONICALIZE_LGPL): Check whether $gl_cv_func_realpath_works
matches "*yes" instead of just "yes".  Regression introduced in commit
e0bcf6626cde8dad4bfbdc4045c744f0cd8b9e24.
---

diff --git a/ChangeLog b/ChangeLog
index d4ab131fd..ce24403aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2012-07-07  Ludovic Courtès  <ludo@gnu.org>
+
+	canonicalize[-lgpl]: handle "guessing" values when cross-building
+	* m4/canonicalize.m4 (gl_FUNC_CANONICALIZE_FILENAME_MODE)
+	(gl_CANONICALIZE_LGPL): Check whether $gl_cv_func_realpath_works
+	matches "*yes" instead of just "yes".  Regression introduced in commit
+	e0bcf6626cde8dad4bfbdc4045c744f0cd8b9e24.
+
+2012-07-07  Ludovic Courtès  <ludo@gnu.org>
 	    Bruno Haible  <bruno@clisp.org>
 
 	canonicalize: make the right guess when cross-compiling to GNU
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 5acf6f0eb..ea51ac420 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-# canonicalize.m4 serial 25
+# canonicalize.m4 serial 26
 
 dnl Copyright (C) 2003-2007, 2009-2012 Free Software Foundation, Inc.
 
@@ -16,8 +16,11 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
   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
-    REPLACE_CANONICALIZE_FILE_NAME=1
+  else
+    case "$gl_cv_func_realpath_works" in
+      *yes) ;;
+      *)    REPLACE_CANONICALIZE_FILE_NAME=1 ;;
+    esac
   fi
 ])
 
@@ -30,12 +33,21 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
     HAVE_CANONICALIZE_FILE_NAME=0
     if test $ac_cv_func_realpath = no; then
       HAVE_REALPATH=0
-    elif test "$gl_cv_func_realpath_works" != yes; then
-      REPLACE_REALPATH=1
+    else
+      case "$gl_cv_func_realpath_works" in
+	*yes) ;;
+	*)    REPLACE_REALPATH=1 ;;
+      esac
     fi
-  elif test "$gl_cv_func_realpath_works" != yes; then
-    REPLACE_CANONICALIZE_FILE_NAME=1
-    REPLACE_REALPATH=1
+  else
+    case "$gl_cv_func_realpath_works" in
+      *yes)
+        ;;
+      *)
+        REPLACE_CANONICALIZE_FILE_NAME=1
+        REPLACE_REALPATH=1
+        ;;
+    esac
   fi
 ])