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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/config/cigma_hdf5.m4
   cs/cigma/trunk/config/cigma_vtk.m4
   cs/cigma/trunk/configure.ac
Log:
Updates to autoconf macros

 * Use flag --with-vtk-suffix to derive the VTK incdir (e.g., vtk-5.2)
 * Always restore regular flags (CXXFLAGS, etc.)
 * Finally added AC_DEFINE constants HAVE_HDF5 and HAVE_VTK

Modified: cs/cigma/trunk/config/cigma_hdf5.m4
===================================================================
--- cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:16:01 UTC (rev 13611)
+++ cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:16:02 UTC (rev 13612)
@@ -54,6 +54,10 @@
             HDF5_LIBS="-lhdf5 -lhdf5_cpp -lz"
             HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
 
+            AC_SUBST(HDF5_INCLUDES)
+            AC_SUBST(HDF5_LIBS)
+            AC_SUBST(HDF5_LDFLAGS)
+
             OLD_CXXFLAGS="$CXXFLAGS"
             OLD_LIBS="$LIBS"
 
@@ -67,9 +71,7 @@
             CXXFLAGS="$OLD_CXXFLAGS"
             LIBS="$OLD_LIBS"
 
-            AC_SUBST(HDF5_INCLUDES)
-            AC_SUBST(HDF5_LIBS)
-            AC_SUBST(HDF5_LDFLAGS)
+            AC_DEFINE([HAVE_HDF5],,[define if the HDF5 library is avaiable])
 
             $1
 

Modified: cs/cigma/trunk/config/cigma_vtk.m4
===================================================================
--- cs/cigma/trunk/config/cigma_vtk.m4	2008-12-10 02:16:01 UTC (rev 13611)
+++ cs/cigma/trunk/config/cigma_vtk.m4	2008-12-10 02:16:02 UTC (rev 13612)
@@ -24,13 +24,12 @@
                     [The prefix where VTK is installed (default is /usr)])],
                 [with_vtk=$withval],
                 [with_vtk="/usr"])
-    AC_ARG_WITH([vtk-version],
+    AC_ARG_WITH([vtk-suffix],
                 [AC_HELP_STRING(
-                    [--with-vtk-version],
-                    [VTK's include directory name is vtk-suffix, e.g., vtk-5.0/.
-                     What's the suffix? (Default -5.0)])],
+                    [--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],
-                [vtk_suffix="-5.0"])
+                [vtk_suffix="-5.2"])
 ])
 
 ##############################################################################
@@ -85,9 +84,7 @@
             ], [$VTK_SUPPORT_LIBS])
             VTK_LIBS="-lvtkIO -lvtkDICOMParser -lvtkFiltering -lvtkCommon $VTK_SUPPORT_LIBS -lvtksys"
 
-            dnl set VTK c,cpp,ld flags
-            #VTK_CFLAGS="-I$VTK_PREFIX/include/vtk$vtk_suffix"
-            #VTK_CXXFLAGS="$VTK_CFLAGS"
+            dnl set VTK flags
             VTK_INCLUDES="-I$VTK_PREFIX/include/vtk$vtk_suffix"
             VTK_LDFLAGS="-L$VTK_PREFIX/lib/vtk$vtk_suffix -L$VTK_PREFIX/lib64/vtk$vtk_suffix"
 
@@ -99,6 +96,7 @@
             if [[ -n "$1" ]]; then
                 
                 dnl the version of VTK we need
+
                 maj=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
                 min=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
                 rel=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
@@ -106,10 +104,12 @@
 
                 dnl in order to be able to compile the following test program,
                 dnl we need to add to the current flags, the VTK settings...
+
                 OLD_CFLAGS=$CFLAGS
                 OLD_CXXFLAGS=$CXXFLAGS
                 OLD_LDFLAGS=$LDFLAGS
                 OLD_LIBS=$LIBS
+
                 CFLAGS="$VTK_CFLAGS $CFLAGS"
                 CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
                 LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
@@ -140,22 +140,17 @@
                     ])
                 ], [vtkVersion="OK"])
 
-                if [[ "$vtkVersion" = "OK" ]]; then
+                dnl restore all flags without VTK values
+                CFLAGS=$OLD_CFLAGS
+                CXXFLAGS=$OLD_CXXFLAGS
+                LDFLAGS=$OLD_LDFLAGS
+                LIBS=$OLD_LIBS
 
+                if [[ "$vtkVersion" = "OK" ]]; then
                     AC_MSG_RESULT([yes])
-
                     $2
-
                 else
-
                     AC_MSG_RESULT([no])
-
-                    dnl restore all flags without VTK values
-                    CFLAGS=$OLD_CFLAGS
-                    CXXFLAGS=$OLD_CXXFLAGS
-                    LDFLAGS=$OLD_LDFLAGS
-                    LIBS=$OLD_LIBS
-
                     $3
                 fi              # if [[ $vtkVersion = "OK ]];
 
@@ -172,6 +167,8 @@
 
             fi          #if [[ -n "$1" ]];
 
+            AC_DEFINE([HAVE_VTK],,[define if the VTK library is available])
+
         fi          # if [[ -z "$vtkFound" ]];
     fi          # $with_vtk != "no"
 ])

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:16:01 UTC (rev 13611)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:16:02 UTC (rev 13612)
@@ -97,8 +97,8 @@
 echo "Cigma is configured with"
 echo "- OS : $UNAME"
 echo "- C compiler   : $CC"
-echo "- C flags      : $CFLAGS"
-#echo "- C++ compiler : $CXX"
+echo "- C++ compiler : $CXX"
+#echo "- C flags      : $CFLAGS"
 #echo "- C++ flags    : $CXXFLAGS"
 
 # Boost flags (from ax_boost_*.m4)