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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/config/cigma_hdf5.m4
   cs/cigma/trunk/configure.ac
Log:
Fix to HDF5 library check (for nonstandard installation prefix)

Modified: cs/cigma/trunk/config/cigma_hdf5.m4
===================================================================
--- cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:15:59 UTC (rev 13610)
+++ cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:16:01 UTC (rev 13611)
@@ -50,17 +50,23 @@
 
             AC_MSG_RESULT([yes])
 
+            HDF5_INCLUDES="-I$HDF5_PREFIX/include"
+            HDF5_LIBS="-lhdf5 -lhdf5_cpp -lz"
+            HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
+
+            OLD_CXXFLAGS="$CXXFLAGS"
+            OLD_LIBS="$LIBS"
+
+            CXXFLAGS="$HDF5_INCLUDES"
+            LIBS="$HDF5_LIBS"
+
             AC_CHECK_LIB([hdf5],[main],[hdf5lib=yes])
             AC_CHECK_LIB([hdf5_cpp],[main],[hdf5cpplib=yes])
             AC_CHECK_HEADERS([H5Cpp.h],,AC_MSG_ERROR(HDF5 C++ headers not found))
 
-            #HDF5_CFLAGS="-I$HDF5_PREFIX/include"
-            #HDF5_CXXFLAGS="$HDF5_CFLAGS"
+            CXXFLAGS="$OLD_CXXFLAGS"
+            LIBS="$OLD_LIBS"
 
-            HDF5_INCLUDES="-I$HDF5_PREFIX/include"
-            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)

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