[MOAB-dev] r2471 - MOAB/trunk/m4

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-12-04 13:47:25 -0600 (Thu, 04 Dec 2008)
New Revision: 2471

Modified:
   MOAB/trunk/m4/hdf5.m4
Log:
second attempt to work around m4 wierdness

Modified: MOAB/trunk/m4/hdf5.m4
===================================================================
--- MOAB/trunk/m4/hdf5.m4	2008-12-04 19:32:30 UTC (rev 2470)
+++ MOAB/trunk/m4/hdf5.m4	2008-12-04 19:47:25 UTC (rev 2471)
@@ -138,23 +138,25 @@
   
   HAVE_LIB_HDF5=no
   AC_CHECK_LIB( [$HDF5_LIBNAME], [H5Fopen], [HAVE_LIB_HDF5=yes] )
-  cv_name="ac_cv_lib_${HDF5_LIBNAME}_H5Fopen"
   if test $HAVE_LIB_HDF5 = no; then
     if test $HAVE_ZLIB = yes; then
-      unset '$cv_name'
-      AC_CHECK_LIB( [$HDF5_LIBNAME], [H5Fopen], [HAVE_LIB_HDF5=yes; HDF5_LIBS="$HDF5_LIBS -lz"], [], [-lz] )
+      unset "ac_cv_lib_${HDF5_LIBNAME}_H5Fopen"
+      unset "ac_cv_lib_${HDF5_LIBNAME}___H5Fopen"
+      AC_CHECK_LIB( [${HDF5_LIBNAME}], [H5Fopen], [HAVE_LIB_HDF5=yes; HDF5_LIBS="$HDF5_LIBS -lz"], [], [-lz] )
     fi
   fi
   if test $HAVE_LIB_HDF5 = no; then
     if test $HAVE_SZIP = yes; then
-      unset '$cv_name'
+      unset "ac_cv_lib_${HDF5_LIBNAME}_H5Fopen"
+      unset "ac_cv_lib_${HDF5_LIBNAME}___H5Fopen"
       AC_CHECK_LIB( [$HDF5_LIBNAME], [H5Fopen], [HAVE_LIB_HDF5=yes; HDF5_LIBS="$HDF5_LIBS -lsz"], [], [-lsz] )
     fi
   fi
   if test $HAVE_LIB_HDF5 = no; then
     if test $HAVE_SZIP = yes; then
       if test $HAVE_ZLIB = yes; then
-        unset '$cv_name'
+        unset "ac_cv_lib_${HDF5_LIBNAME}_H5Fopen"
+        unset "ac_cv_lib_${HDF5_LIBNAME}___H5Fopen"
         AC_CHECK_LIB( [$HDF5_LIBNAME], [H5Fopen], [HAVE_LIB_HDF5=yes; HDF5_LIBS="$HDF5_LIBS -lsz -lz"], [], [-lz -lsz] )
       fi
     fi