Re: ./gnulib-tool --create-testdir --dir=./gnulib_build

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 9/19/2009 5:16 AM:
> According to Simon Josefsson on 9/19/2009 2:41 AM:
>> Files:
>> ...
>> m4/canonicalize-lgpl.m4
> 
>> Bruno, Ben, is this patch the right thing?
> 
> I'm neither, but yes, the patch is right.  Sorry for not realizing I broke
> that when I merged the m4 file of canonicalize/canonicalize-lgpl earlier
> this week.

Also, we need this, to pick up the change in .h file:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkq1FUsACgkQ84KuGfSFAYB+RgCgyKjts0sks+fcnow8z1josLSq
lEUAnjwyQ4OsLnchvpytfV8Hl62uyAJv
=ClWp
-----END PGP SIGNATURE-----

>From ed613b9ec71cb074d341e8f5c5082463fe31c479 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 19 Sep 2009 11:21:19 -0600
Subject: [PATCH] canonicalize-lgpl: adjust clients to use correct header

* m4/canonicalize.m4 (gl_FUNC_CANONICALIZE_FILENAME_MODE)
(gl_CANONICALIZE_LGPL): Use correct shell quoting.
* modules/relocatable-prog-wrapper (Files): Drop canonicalize.h.
* lib/fchdir.c (includes): Use <stdlib.h>, not "canonicalize.h".
* lib/progreloc.c (includes): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                        |    9 +++++++++
 lib/fchdir.c                     |    2 --
 lib/progreloc.c                  |    1 -
 m4/canonicalize.m4               |    8 ++++----
 modules/relocatable-prog-wrapper |    1 -
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6c0efa..68321e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-19  Eric Blake  <address@hidden>
+
+       canonicalize-lgpl: adjust clients to use correct header
+       * m4/canonicalize.m4 (gl_FUNC_CANONICALIZE_FILENAME_MODE)
+       (gl_CANONICALIZE_LGPL): Use correct shell quoting.
+       * modules/relocatable-prog-wrapper (Files): Drop canonicalize.h.
+       * lib/fchdir.c (includes): Use <stdlib.h>, not "canonicalize.h".
+       * lib/progreloc.c (includes): Likewise.
+
 2009-09-19  Jim Meyering  <address@hidden>

        test-posixtm.c: correct a comment
diff --git a/lib/fchdir.c b/lib/fchdir.c
index f355629..677d442 100644
--- a/lib/fchdir.c
+++ b/lib/fchdir.c
@@ -29,8 +29,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>

-#include "canonicalize.h"
-
 #ifndef REPLACE_OPEN_DIRECTORY
 # define REPLACE_OPEN_DIRECTORY 0
 #endif
diff --git a/lib/progreloc.c b/lib/progreloc.c
index a79ef7a..3d01cf2 100644
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -43,7 +43,6 @@
 # include <windows.h>
 #endif

-#include "canonicalize.h"
 #include "relocatable.h"

 #ifdef NO_XMALLOC
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 2d24350..119ebb7 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -18,7 +18,7 @@ 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
+  elif test "$gl_cv_func_realpath_works" != yes; then
     REPLACE_CANONICALIZE_FILE_NAME=1
   fi
 ])
@@ -32,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
@@ -73,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.])
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index b326201..b2c8cd4 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -11,7 +11,6 @@ lib/progreloc.c
 lib/areadlink.h
 lib/areadlink.c
 lib/readlink.c
-lib/canonicalize.h
 lib/canonicalize-lgpl.c
 lib/malloca.h
 lib/malloca.c
-- 
1.6.5.rc1