[cig-commits] r9166 - cs/benchmark/cigma/trunk/build/m4

[luis at geodynamics.org]

Author: luis
Date: 2008-01-28 23:37:05 -0800 (Mon, 28 Jan 2008)
New Revision: 9166

Modified:
   cs/benchmark/cigma/trunk/build/m4/hdf5.m4
Log:
Set the necessary HDF5 compiler flags given the prefix


Modified: cs/benchmark/cigma/trunk/build/m4/hdf5.m4
===================================================================
--- cs/benchmark/cigma/trunk/build/m4/hdf5.m4	2008-01-29 07:37:05 UTC (rev 9165)
+++ cs/benchmark/cigma/trunk/build/m4/hdf5.m4	2008-01-29 07:37:05 UTC (rev 9166)
@@ -5,35 +5,61 @@
 
 ##############################################################################
 #
-# CIG_ARG_HDF5
+# CIGMA_OPTIONS_HDF5
 #
-AC_DEFUN([CIGMA_ARG_HDF5], [
+AC_DEFUN([CIGMA_OPTIONS_HDF5], [
     AC_ARG_VAR(HDF5_HOME, [home path to HDF5 library])
     AC_ARG_WITH([hdf5],
         [AC_HELP_STRING([--with-hdf5],
-                        [enable HDF5 @<:@default=$1@:>@])],
+                        [enable HDF5 @<:@default=/usr@:>@])],
         [with_hdf5="$withval"],
-        [with_hdf5=$1])
+        [with_hdf5="/usr"])
 ])
 
 ##############################################################################
 #
-# CIG_PATH_HDF5([minimum-version], [action-if-found], [action-if-not-found])
+# CIGMA_PATH_HDF5([action-if-found], [action-if-not-found])
+#
 AC_DEFUN([CIGMA_PATH_HDF5],[
     
     if [[ $with_hdf5 = "yes" ]]; then
-        with_hdf5="/usr/local"
+
+        dnl in case user wrote --with-hdf5=yes
+        with_hdf5="/usr"
+
     fi
 
+
     if [[ $with_hdf5 != "no" ]]; then
 
         HDF5_PREFIX="$with_hdf5"
 
-        AC_CHECK_FILE
+        AC_CHECK_FILE([$HDF5_PREFIX/include/hdf5.h],[hdf5Found="OK"])
+        AC_MSG_CHECKING([if HDF5 is installed in $HDF5_PREFIX])
 
+        if [[ -z "$hdf5Found" ]]; then
+
+            dnl HDF5 not found!
+            AC_MSG_RESULT([no])
+            $3
+
+        else
+
+            dnl HDF5 found!
+            AC_MSG_RESULT([yes])
+            HDF5_CFLAGS="-I$HDF5_PREFIX/include"
+            HDF5_CXXFLAGS="$HDF5_CFLAGS"
+            HDF5_LIBS="-lhdf5"
+            HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS -Wl,--rpath -Wl,$HDF5_PREFIX/lib"
+            $2
+
+        fi
+
     else
         
-        /bin/true
+        dnl user specified --with-hdf5=no
+        dnl nothing to do?
+        /bin/false
 
     fi  # if [[ $with_hdf5 != "no" ]];