You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/30 22:52:00 UTC

svn commit: r451662 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp: Makefile.am configure.ac

Author: chirino
Date: Sat Sep 30 13:52:00 2006
New Revision: 451662

URL: http://svn.apache.org/viewvc?view=rev&rev=451662
Log:
Adjusted the build so that it does not fail if you do not have cppunit installed.

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am?view=diff&rev=451662&r1=451661&r2=451662
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am Sat Sep 30 13:52:00 2006
@@ -1,8 +1,10 @@
 # Since we don't strictly follow the GNU standard of having 'NEWS README AUTHORS ChangeLog' files
 AUTOMAKE_OPTIONS = foreign
 
-#Build in these directories:
-SUBDIRS = src/main src/examples src/test src/test-integration
+SUBDIRS = src/main src/examples
+if BUILD_CPPUNIT_TESTS
+  SUBDIRS += src/test src/test-integration
+endif
 
 #Distribute these directories:
 DIST_SUBDIRS = src/main 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=diff&rev=451662&r1=451661&r2=451662
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Sat Sep 30 13:52:00 2006
@@ -64,6 +64,7 @@
 AC_CHECK_HEADERS([repcdce.h])
 
 AM_PATH_CPPUNIT(1.10.2, cppunit=yes, cppunit=no) ## AC_MSG_ERROR([cppunit required for build.])) 
+AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, test x$cppunit = xyes)
 
 case "${host_os}" in
 
@@ -100,8 +101,6 @@
 then
   AC_CONFIG_FILES(src/test/Makefile)
   AC_CONFIG_FILES(src/test-integration/Makefile)
-else
-  AC_MSG_WARN(cppunit not found, unit and itegration tests will not be built)
 fi
 
 AC_OUTPUT