[cig-commits] r13623 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:16:20 -0800 (Tue, 09 Dec 2008)
New Revision: 13623

Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/configure.ac
Log:
Fixed incorrect usage of AM_CONDITIONAL

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:16:18 UTC (rev 13622)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:16:20 UTC (rev 13623)
@@ -354,33 +354,30 @@
 
 ###############################################################################
 # Unit tests
+# {{{
 
-
-# Compile this as part of make check
+# Which tests to compile on 'make check'
 check_PROGRAMS =
 
-# Also run the tests as part of make check
+# Which tests to run on 'make check'
 TESTS =
 
-if ENABLE_TESTING
-
-  check_PROGRAMS += cigma-test
-
-  TESTS += cigma-test
-  TESTS += $(top_srcdir)/tests/pytests/runner.py
-  TESTS += $(top_srcdir)/tests/system/runner.py
-
+if COND_CPPUNIT
   cigma_test_CXXFLAGS = $(cigma_test_cxxflags)
   cigma_test_LDFLAGS  = $(cigma_test_ldflags)
   cigma_test_LDADD    = $(cigma_test_ldadd)
   cigma_test_SOURCES  = $(cigma_test_sources)
+  check_PROGRAMS += cigma-test
+  TESTS += cigma-test
+endif
 
+if ENABLE_TESTING
+  TESTS += $(top_srcdir)/tests/pytests/runner.py
+  TESTS += $(top_srcdir)/tests/system/runner.py
 endif
 
-# cigma tests {{{
+# Compiler/Linker Options
 
-## Compiler/Linker Options
-
 cigma_test_cxxflags =
 cigma_test_cxxflags += $(CPPUNIT_CFLAGS)
 cigma_test_cxxflags += $(BOOST_CPPFLAGS)
@@ -405,6 +402,9 @@
 cigma_test_ldadd += $(BOOST_SYSTEM_LIB)
 cigma_test_ldadd += $(BOOST_FILESYSTEM_LIB)
 
+
+# source files
+
 cigma_test_sources = \
 	tests/simple/SimpleTest.h \
 	tests/simple/SimpleTest.cpp \

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:16:18 UTC (rev 13622)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:16:20 UTC (rev 13623)
@@ -79,12 +79,15 @@
     [enable_testing="$enableval"],
     [enable_testing="yes"]
 )
-AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes])
+AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes]) # XXX: not really needed
+
+with_cppunit=no
 if test "$enable_testing" = "yes"; then
     AM_PATH_CPPUNIT([1.12.0],
         [with_cppunit=yes],
         [with_cppunit=no; AC_MSG_RESULT([no. Unit tests disabled])])
 fi
+AM_CONDITIONAL([COND_CPPUNIT], [test "$with_cppunit" = yes])
 
 
 dnl XXX: Update DISTCHECK_CONFIGURE_FLAGS (see m4 macros in gitosis branch)