diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 36 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 5 |
3 files changed, 20 insertions, 25 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index bf0001226a..54b2342875 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -72,6 +72,7 @@ if test "${enableval}" = yes; then COMPILER_FLAGS= fi +AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_SUBST([LIBTOOL_DEPS]) @@ -100,35 +101,26 @@ CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS AC_SUBST(CPPUNIT_LIBS) AC_SUBST(CPPUNIT_CXXFLAGS) -AC_ARG_ENABLE(apr, -[ --enable-apr use the Apache Portable Runtime library (default) - --disable-apr do not use the Apache Portable Runtime library], -[case $enableval in - yes|no) ;; - *) AC_MSG_ERROR([invalid APR enable/disable value: $enableval]) ;; - esac], -[enableval=yes]) - +# Removed --enable-apr option as we currently don't build without APR. + APR_MINIMUM_VERSION=1.2.2 AC_SUBST(APR_MINIMUM_VERSION) AC_SUBST(APR_CXXFLAGS) AC_SUBST(USE_APR) -if test "$enableval" = yes; then - PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) - APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1" - USE_APR=1 -fi +PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) +APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1" +USE_APR=1 -AC_ARG_ENABLE(valgrind, - [ --enable-valgrind enable testing via valgrind, if available (recommended) - --disable-valgrind do not use valgrind], +AC_ARG_ENABLE([valgrind], + [AS_HELP_STRING([--enable-valgrind], + [run valgrind memory checker on tests, if available (default yes)])], [case $enableval in - yes|no) enable_VALGRIND=$enableval;; - *) AC_MSG_ERROR([invalid valgrind enable/disable value: $enableval]);; - esac], - [enable_VALGRIND=yes] # no option given, default - ) + yes|no) enable_VALGRIND=$enableval;; + *) AC_MSG_ERROR([Invalid value for --enable-valgrind: $enableval]);; + esac], + [enable_VALGRIND=yes] +) # We use valgrind for the tests. See if it's available. # Check for it unconditionally, so we don't have to duplicate its diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 32c2e1a00d..6937db2e1b 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -312,5 +312,9 @@ $(gen)/gen-src.mk: $(gen)/timestamp mv $@-t $@ endif +maintainer-clean: + rm -f $(gentools_srcdir)/*.class + rm -f $(BUILT_SOURCES) + # Force build during dist phase so help2man will work. dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS) diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 6fc3b97324..3e96581573 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -111,13 +111,12 @@ gen.mk: Makefile.am > $@-t mv $@-t $@ -check: .valgrindrc $(check_LTLIBRARIES) \ - $(lib_common) $(lib_client) $(lib_broker) ../qpidd +check: .valgrindrc ../qpidd check-unit: $(MAKE) check TESTS=run-unit-tests -# Create a copy so user can modify without risk of checking in their mods. +# Create a copy so that can be modified without risk of committing the changes. .valgrindrc: .valgrindrc-default cp $(srcdir)/.valgrindrc-default .valgrindrc |