Merge branch 'dap4tests2.tmp' into dap4tests2.dmh

CMakeLists.txt

@@ -1066,7 +1066,7 @@ IF(ENABLE_DAP)
     SET(ENABLE_DAP4 ON CACHE BOOL "")
   ELSE(ENABLE_HDF5)
     SET(ENABLE_DAP4 OFF CACHE BOOL "")
-  ENDIF(ENABLE_HDF5)
+  ENDIF(NOT ENABLE_HDF5)
 
 ELSE()
   SET(ENABLE_DAP2 OFF CACHE BOOL "")

dap4_test/test_hyrax.sh

@@ -23,6 +23,7 @@ nc4_test_files/nc4_strings_comp.nc \
 nc4_test_files/ref_tst_compounds.nc \
 hyrax/RSS/amsre/bmaps_v05/y2006/m01/amsre_20060131v5.dat?dap4.ce=time_a \
 "
+F=nc4_test_files/nc4_nc_classic_no_comp.nc
 
 failure() {
       echo "*** Fail: $1"

libdispatch/dutil.c

@@ -400,6 +400,8 @@ done:
 #if defined __APPLE__ 
 /** \internal */
 
+#if ! defined HAVE_DECL_ISINF
+
 int isinf(double x)
 {
     union { unsigned long long u; double f; } ieee754;
@@ -408,6 +410,9 @@ int isinf(double x)
            ( (unsigned)ieee754.u == 0 );
 }
 
+#endif /* HAVE_DECL_ISINF */
+
+#if ! defined HAVE_DECL_ISNAN
 /** \internal */
 int isnan(double x)
 {
@@ -417,6 +422,8 @@ int isnan(double x)
            ( (unsigned)ieee754.u != 0 ) > 0x7ff00000;
 }
 
+#endif /* HAVE_DECL_ISNAN */
+
 #endif /*APPLE*/
 #endif /*!_INTEL_COMPILER*/