diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-07-07 01:36:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-07-07 01:36:08 +0200 |
| commit | 015b7087957c56f9d3322f0dfb1b8bbb4df35299 (patch) | |
| tree | 7e36a5800de34ca0e680e97b42b29f6aaf2497ba /m4 | |
| parent | 407d13dddc2ecd5fef317520529f3ddff28a9213 (diff) | |
Work around `gl_CANONICALIZE_LGPL' bug when cross-compiling.
* gnulib-local/m4/canonicalize.m4.diff: New file.
* Makefile.am (EXTRA_DIST): Add it.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/canonicalize.m4 | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index 69b3f4ca2..3c4c5ee3e 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 ]) |