diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-17 16:20:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-17 16:20:52 +0100 |
| commit | 7ae4e75af5366086e60fbc2e9454dfd9e5965102 (patch) | |
| tree | 61ea2340323e17e362de7860824917d3eeb66abd /gnulib-local | |
| parent | 44cd55752aad2a69e1583a2cb37c3b98c5c44ad3 (diff) | |
Update Gnulib to v0.0-7695-g26c0590.
* gnulib-local/m4/canonicalize.m4.diff: Remove.
* Makefile.am (EXTRA_DIST): Adjust accordingly.
Diffstat (limited to 'gnulib-local')
| -rw-r--r-- | gnulib-local/m4/canonicalize.m4.diff | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/gnulib-local/m4/canonicalize.m4.diff b/gnulib-local/m4/canonicalize.m4.diff deleted file mode 100644 index 57f44726f..000000000 --- a/gnulib-local/m4/canonicalize.m4.diff +++ /dev/null @@ -1,67 +0,0 @@ -Fix `canonicalize_file_name' replacement handling when cross-compiling. -Without this patch, we end up with: - - ./.libs/libguile-2.0.so: undefined reference to `rpl_canonicalize_file_name' - -See <http://hydra.nixos.org/build/2765567> for details. - -index 69b3f4c..3c4c5ee 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 - ]) - - -Now, work around a second bug: fix default value when cross-compiling -for GNU/Hurd. - -index 69b3f4c..111ddf8 100644 ---- a/m4/canonicalize.m4 -+++ b/m4/canonicalize.m4 -@@ -95,7 +95,7 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], - [gl_cv_func_realpath_works=no], - [case "$host_os" in - # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_realpath_works="guessing yes" ;; -+ *gnu*) gl_cv_func_realpath_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_realpath_works="guessing no" ;; - esac |