diff options
| author | Eric Blake <eblake@redhat.com> | 2010-12-24 13:20:48 -0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2013-09-18 12:49:49 +0700 |
| commit | f59ca8a7e78ebfebb6be24e6b731e7da795ae7aa (patch) | |
| tree | 13c34f099c53448ccb04b0fba6632894100efd6f | |
| parent | fbcce6f63f9c2dc2f0a54f5217cfb4c4ed4d8a28 (diff) | |
| download | m4-f59ca8a7e78ebfebb6be24e6b731e7da795ae7aa.tar.gz | |
build: pull in various gnulib fixes
* m4/gnulib-cache.m4: Reflect spawn-pipe module name change.
* modules/gnu.c (includes): Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | ltdl/m4/gnulib-cache.m4 | 4 | ||||
| -rw-r--r-- | modules/gnu.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4 index d0acf3fb..5e3e9c93 100644 --- a/ltdl/m4/gnulib-cache.m4 +++ b/ltdl/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gl]) @@ -71,7 +71,6 @@ gl_MODULES([ mkstemp obstack obstack-printf-posix - pipe progname propername quote @@ -80,6 +79,7 @@ gl_MODULES([ rename setenv snprintf-posix + spawn-pipe sprintf-posix stdbool stdlib-safer diff --git a/modules/gnu.c b/modules/gnu.c index 5aa4e74a..3b50847c 100644 --- a/modules/gnu.c +++ b/modules/gnu.c @@ -29,8 +29,8 @@ #endif #include "modules/m4.h" -#include "pipe.h" #include "quotearg.h" +#include "spawn-pipe.h" #include "wait-process.h" /* Rename exported symbols for dlpreload()ing. */ |