Merge branch 'master' into issue365.dmh

Author: WardF

CMakeLists.txt

@@ -442,6 +442,8 @@ IF(ENABLE_HDF4)
     MESSAGE(FATAL_ERROR "Can't find or link to the hdf4 mfhdf library.")
   ENDIF()
 
+  SET(HAVE_LIBMFHDF TRUE)
+
   SET(HDF4_LIBRARIES ${HDF4_DF_LIB} ${HDF4_MFHDF_LIB})
   # End include files, libraries.
   MESSAGE(STATUS "HDF4 libraries: ${HDF4_DF_LIB}, ${HDF4_MFHDF_LIB}")
@@ -454,6 +456,7 @@ IF(ENABLE_HDF4)
     MESSAGE(FATAL_ERROR "HDF4 Support enabled but cannot find jpeglib.h")
   ELSE()
     SET(HAVE_JPEGLIB_H ON CACHE BOOL "")
+    SET(HAVE_LIBJPEG TRUE)
     INCLUDE_DIRECTORIES(${JPEGLIB_H_INCLUDE_DIR})
   ENDIF()
 

config.h.cmake.in

@@ -526,7 +526,7 @@ are set when opening a binary file on Windows. */
 
 /* If true, use use wget to fetch some sample HDF4 data, and then test against
    it. */
-#cmakedefine USE_HDF4_FILE_TESTS 1
+//#cmakedefine USE_HDF4_FILE_TESTS 1
 
 /* if true, enable dynamic loading support */
 #cmakedefine USE_LIBDL 1