[cig-commits] r13835 - cs/cigma/trunk/config

[luis at geodynamics.org]

Author: luis
Date: 2009-01-12 14:10:01 -0800 (Mon, 12 Jan 2009)
New Revision: 13835

Modified:
   cs/cigma/trunk/config/cigma_hdf5.m4
Log:
Updated CIGMA_PATH_HDF5 autoconf macro

Do not set HDF5_INCLUDES and HDF5_LDFLAGS when HDF5_PREFIX is /usr

Modified: cs/cigma/trunk/config/cigma_hdf5.m4
===================================================================
--- cs/cigma/trunk/config/cigma_hdf5.m4	2009-01-12 22:10:00 UTC (rev 13834)
+++ cs/cigma/trunk/config/cigma_hdf5.m4	2009-01-12 22:10:01 UTC (rev 13835)
@@ -48,10 +48,13 @@
 
             AC_MSG_RESULT([yes])
 
-            HDF5_INCLUDES="-I$HDF5_PREFIX/include"
             HDF5_LIBS="-lhdf5 -lhdf5_cpp -lz"
-            HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
 
+            if [[ $HDF5_PREFIX != "/usr" ]]; then
+                HDF5_INCLUDES="-I$HDF5_PREFIX/include"
+                HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
+            fi
+
             OLD_CXXFLAGS="$CXXFLAGS"
             OLD_LIBS="$LIBS"