[cig-commits] r5176 - in short/3D/PyLith/branches/pylith-0.8: . pylith3d/module

[leif at geodynamics.org]

Author: leif
Date: 2006-11-03 17:01:16 -0800 (Fri, 03 Nov 2006)
New Revision: 5176

Modified:
   short/3D/PyLith/branches/pylith-0.8/configure.ac
   short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am
Log:
Fix for issue62:

    "PETSc autoconf macro CIT_PETSC_SIEVE out of date".

Also, use AC_HELP_STRING.


Modified: short/3D/PyLith/branches/pylith-0.8/configure.ac
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/configure.ac	2006-11-04 00:56:20 UTC (rev 5175)
+++ short/3D/PyLith/branches/pylith-0.8/configure.ac	2006-11-04 01:01:16 UTC (rev 5176)
@@ -22,12 +22,12 @@
 
 # Green's functions option
 AC_ARG_ENABLE([greensfns],
-	[  --enable-greensfns        Enable Green's functions application (requires Numeric) [[default=no]]],
-	[enable_greensfns=yes],
-	[enable_greensfns=no])
+    [AC_HELP_STRING([--enable-greensfns],
+        [enable Green's functions application (requires Numeric) @<:@default=no@:>@])],
+    [enable_greensfns=yes],
+    [enable_greensfns=no])
 AM_CONDITIONAL([ENABLE_GREENSFNS], [test "$enable_greensfns" = yes])
 
-
 # Checks for programs.
 AM_PATH_PYTHON([2.3])
 CIT_PYTHON_SYSCONFIG
@@ -61,18 +61,8 @@
 # Checks for libraries.
 CIT_CHECK_LIB_MPI
 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 header files.
 CIT_HEADER_MPI
 CIT_HEADER_PETSC

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am	2006-11-04 00:56:20 UTC (rev 5175)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/module/Makefile.am	2006-11-04 01:01:16 UTC (rev 5176)
@@ -28,7 +28,7 @@
 CXX = $(MPICXX)
 CXXLD = @CXX@
 INCLUDES = $(PETSC_INCLUDE) -I$(PYTHON_INCDIR) $(MPIINCLUDES)
-CPPFLAGS += $(SIEVE_FLAGS)
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
 sources = \
 	array.cc \
 	array.h \