Savannah Git Hosting - m4.git/commitdiff

diff --git a/Makefile.am b/Makefile.am

index 42bf963f10073654bfcb2079fa1f5cb2d4112ad8..68c5efcd7202a743046af4b39a41e89cd2b7fecd 100644 (file)

--- a/Makefile.am

+++ b/Makefile.am

# Enough users install GNU M4 as gm4 that we make sure 'make installcheck'

# will handle that, as part of making a release.

-DISTCHECK_CONFIGURE_FLAGS = --disable-assert --program-prefix=g

+DISTCHECK_CONFIGURE_FLAGS = \

+ --disable-assert \

+ --program-prefix=g \

+ --enable-cxx

# We need to remove any file droppings left behind by testsuite.

clean-local-tests:

diff --git a/configure.ac b/configure.ac

index 51d1bd5fe0b13470f44ce5774e3e7e6052530146..2489824c8b095eefa346e02542f9574d4abef007 100644 (file)

--- a/configure.ac

+++ b/configure.ac

## C compiler checks. ##

## ------------------ ##

AC_PROG_CC

+AC_DEFUN([gl_CXX_CHOICE_DEFAULT_NO])

M4_EARLY

AC_SYS_LARGEFILE

diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4

index cad1d9da1f175d60b935a5a6800470b839b415c8..d0acf3fb6643273686e7fc74daecf3d351f0bf8a 100644 (file)

--- a/ltdl/m4/gnulib-cache.m4

+++ b/ltdl/m4/gnulib-cache.m4

# 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 --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 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

# Specification in the form of a few gnulib-tool.m4 macro invocations:

gl_LOCAL_DIR([gl])

xstrndup

xvasprintf-posix

])

+gl_WITH_CXX_TESTS

gl_AVOID([])

gl_SOURCE_BASE([gnu])

gl_M4_BASE([ltdl/m4])