From 582164eea092acf5a9f361df0f48fc469b89a82a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 4 Jun 2010 09:18:08 -0600 Subject: maint: enable additional c++ tests with make dist. * configure.ac (gl_CXX_CHOICE_DEFAULT_NO): Make default for C++ tests be disabled... * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): ...but run them when building package. * ltdl/m4/gnulib-cache.m4: Regenerate. Signed-off-by: Eric Blake --- Makefile.am | 5 ++++- configure.ac | 1 + ltdl/m4/gnulib-cache.m4 | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 42bf963f..68c5efcd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -424,7 +424,10 @@ installcheck-local: tests/atconfig tests/atlocal $(TESTSUITE) \ # 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 51d1bd5f..2489824c 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ## 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 cad1d9da..d0acf3fb 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 --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]) @@ -102,6 +102,7 @@ gl_MODULES([ xstrndup xvasprintf-posix ]) +gl_WITH_CXX_TESTS gl_AVOID([]) gl_SOURCE_BASE([gnu]) gl_M4_BASE([ltdl/m4]) -- cgit v1.2.1