[cig-commits] r13622 - in cs/cigma/trunk: . config

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/config/cigma_hdf5.m4
   cs/cigma/trunk/config/cigma_vtk.m4
   cs/cigma/trunk/configure.ac
Log:
Misc updates to configure files

Modified: cs/cigma/trunk/config/cigma_hdf5.m4
===================================================================
--- cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:16:17 UTC (rev 13621)
+++ cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:16:18 UTC (rev 13622)
@@ -8,7 +8,7 @@
 # CIGMA_OPTIONS_HDF5
 #
 AC_DEFUN([CIGMA_OPTIONS_HDF5], [
-    AC_ARG_VAR(HDF5_HOME, [home path to HDF5 library])
+    AC_ARG_VAR(HDF5_HOME, [Home path to HDF5 library])
     AC_ARG_WITH([hdf5],
         [AC_HELP_STRING([--with-hdf5],
                         [The prefix where HDF5 is installed @<:@default=/usr@:>@])],

Modified: cs/cigma/trunk/config/cigma_vtk.m4
===================================================================
--- cs/cigma/trunk/config/cigma_vtk.m4	2008-12-10 02:16:17 UTC (rev 13621)
+++ cs/cigma/trunk/config/cigma_vtk.m4	2008-12-10 02:16:18 UTC (rev 13622)
@@ -21,14 +21,14 @@
     AC_ARG_WITH([vtk],
                 [AC_HELP_STRING(
                     [--with-vtk],
-                    [The prefix where VTK is installed (default is /usr)])],
-                [with_vtk=$withval],
+                    [The prefix where VTK is installed @<:@default=/usr@:>@])],
+                [with_vtk="$withval"],
                 [with_vtk="/usr"])
     AC_ARG_WITH([vtk-suffix],
                 [AC_HELP_STRING(
                     [--with-vtk-suffix],
-                    [Suffix to append to VTK's include directory, e.g., for vtk-5.2/ the suffix is -5.2 (default)])],
-                [vtk_suffix=$withval],
+                    [Suffix to append to VTK's include directory, e.g., for vtk-5.2/ the suffix is "-5.2" (default)])],
+                [vtk_suffix="$withval"],
                 [vtk_suffix="-5.2"])
 ])
 

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:16:17 UTC (rev 13621)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:16:18 UTC (rev 13622)
@@ -29,6 +29,8 @@
 
 
 dnl Check for Python
+AC_ARG_VAR(PYTHON, [Python interpreter])
+AC_ARG_VAR(PYTHONPATH, [Python module search path])
 AM_PATH_PYTHON(2.4, :)
 CIGMA_PYTHON_SYSCONFIG
 if [ test "$PYTHON" != : ]; then
@@ -46,6 +48,7 @@
 
 
 dnl Configure Boost
+AC_ARG_VAR(BOOST_ROOT, [Location of staged boost library])
 AX_BOOST_BASE([1.33])
 AX_BOOST_SYSTEM
 AX_BOOST_FILESYSTEM
@@ -71,7 +74,11 @@
 
 
 dnl Configure CppUnit
-AC_ARG_ENABLE([testing], [AC_HELP_STRING([--enable-testing], [enable unit testing with cppunit (requires cppunit) @<:@default=no@:>@])])
+AC_ARG_ENABLE([testing],
+    [AC_HELP_STRING([--enable-testing], [enable unit testing with cppunit (requires cppunit) @<:@default=yes@:>@])],
+    [enable_testing="$enableval"],
+    [enable_testing="yes"]
+)
 AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes])
 if test "$enable_testing" = "yes"; then
     AM_PATH_CPPUNIT([1.12.0],