[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] canonicalize[-lgpl]: properly handle "guessing" values when
From: |
Ludovic Courtès |
Subject: |
[PATCH 2/2] canonicalize[-lgpl]: properly handle "guessing" values when cross-building |
Date: |
Sat, 7 Jul 2012 02:04:55 +0200 |
* 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.
---
ChangeLog | 6 ++++++
m4/canonicalize.m4 | 26 +++++++++++++++++++-------
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 639f157..8102420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
determine whether cross-compiling to glibc systems, so as to
include GNU/Hurd.
+ canonicalize[-lgpl]: properly 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-06 Paul Eggert <address@hidden>
timespec-sub: avoid duplicate include
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 111ddf8..37df6fc 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -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
])
--
1.7.10.4