[cig-commits] r5177 - in short/3D/PyLith/trunk: . libsrc/feassemble libsrc/meshio unittests/libtests/feassemble

[leif at geodynamics.org]

Author: leif
Date: 2006-11-03 17:29:44 -0800 (Fri, 03 Nov 2006)
New Revision: 5177

Modified:
   short/3D/PyLith/trunk/configure.ac
   short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am
   short/3D/PyLith/trunk/libsrc/meshio/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
Log:
Fix for issue62:

    "PETSc autoconf macro CIT_PETSC_SIEVE out of date".

Also, use AC_HELP_STRING.


Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2006-11-04 01:01:16 UTC (rev 5176)
+++ short/3D/PyLith/trunk/configure.ac	2006-11-04 01:29:44 UTC (rev 5177)
@@ -30,14 +30,16 @@
 
 # TESTING w/cppunit
 AC_ARG_ENABLE([testing],
-	[  --enable-testing        Enable unit testing with cppunit (requires cppunit) [[default=no]]],
+    [AC_HELP_STRING([--enable-testing],
+        [enable unit testing with cppunit (requires cppunit) @<:@default=no@:>@])],
 	[enable_testing=yes],
 	[enable_testing=no])
 AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes])
 
 # DOCUMENTATION w/doxygen
 AC_ARG_ENABLE([documentation],
-	[  --enable-documentation  Enable buuilding html documentation (requires doxygen) [[default=no]]],
+    [AC_HELP_STRING([--enable-documentation],
+        [enable building HTML documentation (requires doxygen) @<:@default=no@:>@])],
 	[enable_documentation=yes],
 	[enable_documentation=no])
 AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test "$enable_documentation" = yes])
@@ -63,16 +65,7 @@
 CIT_PATH_PETSC([2.3])
 CIT_HEADER_PETSC
 CIT_CHECK_LIB_PETSC
-#CIT_PETSC_SIEVE --Out of date---
-# :TODO: Update CIT_PETSC_SIEVE as follows:
-# Replace
-# ALE::Sieve *topology;
-# with
-# const int dim = 3;
-# ALE::Mesh mesh(PETSC_COMM_WORLD, dim);
-# :TODO: Line below needs to be integrated into CIT_PETSC_SIEVE with 
-# value of SIEVE_FLAGS extracted from petsconf
-AC_SUBST([SIEVE_FLAGS], ["-DALE_USE_DEBUGGING -DALE_HAVE_CXX_ABI -DALE_USE_LOGGING -DALE_LOGGING_USE_EVENTS -DALE_LOGGING_LOG_MEM -DALE_LOGGING_VERBOSE"])
+CIT_CHECK_LIB_PETSC_SIEVE
 
 # Checks for Python modules and packages.
 CIT_PATH_PYTHIA([0.8], [mpi])

Modified: short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am	2006-11-04 01:01:16 UTC (rev 5176)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am	2006-11-04 01:29:44 UTC (rev 5177)
@@ -51,7 +51,7 @@
 noinst_HEADERS =
 
 INCLUDES += $(PETSC_INCLUDE)
-CPPFLAGS += $(SIEVE_FLAGS)
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
 
 # export
 clean-local: clean-subpkgincludeHEADERS

Modified: short/3D/PyLith/trunk/libsrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/Makefile.am	2006-11-04 01:01:16 UTC (rev 5176)
+++ short/3D/PyLith/trunk/libsrc/meshio/Makefile.am	2006-11-04 01:29:44 UTC (rev 5177)
@@ -28,7 +28,7 @@
 noinst_HEADERS =
 
 INCLUDES += $(PETSC_INCLUDE)
-CPPFLAGS += $(SIEVE_FLAGS)
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
 
 # export
 clean-local: clean-subpkgincludeHEADERS

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2006-11-04 01:01:16 UTC (rev 5176)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2006-11-04 01:29:44 UTC (rev 5177)
@@ -102,7 +102,7 @@
 	-ljournal
 
 INCLUDES += $(PETSC_INCLUDE)
-CPPFLAGS += $(SIEVE_FLAGS)
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
 
 testfeassemble_LDADD = \
 	-lcppunit -ldl \