diff options
| author | Eric Blake <ebb9@byu.net> | 2006-10-17 16:13:03 +0000 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2007-09-21 15:27:40 -0600 |
| commit | 01a562d206214ff6618b6e6c36f61c6859f66bdf (patch) | |
| tree | 517488419546fd5fac522ba50596ebb68cfc1fb0 | |
| parent | 8d5c8e670f4e7c4da0dc8bfb77d4392b4a600a1f (diff) | |
| download | m4-01a562d206214ff6618b6e6c36f61c6859f66bdf.tar.gz | |
* m4/gnulib-cache.m4: Update with 'gnulib-tool --import
config-h'.
* configure.ac (AC_CONFIG_HEADERS): Create config.h alongside
gnulib headers, rather than in top directory.
* src/Makefile.am (AUTOMAKE_OPTIONS): Add nostdinc, to reduce make
output clutter.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/gnulib-cache.m4 | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
4 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2006-10-17 Eric Blake <ebb9@byu.net> + + * m4/gnulib-cache.m4: Update with 'gnulib-tool --import + config-h'. + * configure.ac (AC_CONFIG_HEADERS): Create config.h alongside + gnulib headers, rather than in top directory. + * src/Makefile.am (AUTOMAKE_OPTIONS): Add nostdinc, to reduce make + output clutter. + 2006-10-16 Eric Blake <ebb9@byu.net> * doc/m4.texinfo: Backport some minor cleanups from head. diff --git a/configure.ac b/configure.ac index c2f09ab9..50f3cbfd 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ VERSION=$PACKAGE_VERSION; AC_SUBST([VERSION]) m4_pattern_forbid([^M4_[A-Z]]) AC_CONFIG_SRCDIR([src/m4.h]) -AC_CONFIG_HEADERS([config.h:config-h.in]) +AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) AC_CANONICAL_BUILD AC_CANONICAL_HOST diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index ea73a681..8927cd14 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -15,11 +15,11 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 binary-io clean-temp cloexec close-stream closeout error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol unlocked-io verror xalloc xvasprintf +# gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 binary-io clean-temp cloexec close-stream closeout config-h error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol unlocked-io verror xalloc xvasprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) -gl_MODULES([binary-io clean-temp cloexec close-stream closeout error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol unlocked-io verror xalloc xvasprintf]) +gl_MODULES([binary-io clean-temp cloexec close-stream closeout config-h error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol unlocked-io verror xalloc xvasprintf]) gl_AVOID([]) gl_SOURCE_BASE([lib]) gl_M4_BASE([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index 98996d41..ac7f1a82 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ ## ## This file written by Eric Blake <ebb9@byu.net> +AUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib bin_PROGRAMS = m4 m4_SOURCES = m4.h m4.c builtin.c debug.c eval.c format.c freeze.c input.c \ |