From ed613b9ec71cb074d341e8f5c5082463fe31c479 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
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 <ebb9@byu.net>
---
 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 f6c0efab2..68321e975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-19  Eric Blake  <ebb9@byu.net>
+
+	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  <meyering@redhat.com>
 
 	test-posixtm.c: correct a comment
diff --git a/lib/fchdir.c b/lib/fchdir.c
index f35562911..677d4422e 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 a79ef7a2c..3d01cf20d 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 2d24350e1..119ebb75b 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 b32620144..b2c8cd4b3 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
-- 
2.11.0