Mercurial > hg > octave-lojdl > gnulib-hg
changeset 12034:3a36df817115
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>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Sat, 19 Sep 2009 11:21:19 -0600 |
| parents | 70dfa341179d |
| children | 2898ee238452 |
| files | ChangeLog lib/fchdir.c lib/progreloc.c m4/canonicalize.m4 modules/relocatable-prog-wrapper |
| diffstat | 5 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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
--- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -18,7 +18,7 @@ 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_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 @@ ], [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.])