Merge pull request #917 from durack1/issue847_durack1_udunits2217Update

Issue847 durack1 udunits2217 update
looks good, works for me

Author: doutriaux1

CMake/cdat_modules/udunits2_external.cmake

@@ -2,13 +2,13 @@ set(udunits_source "${CMAKE_CURRENT_BINARY_DIR}/build/udunits2")
 set(udunits_install "${cdat_EXTERNALS}")
 
 set(udunits_patch_command "")
-if(APPLE)
-  # Modified configure file to workaround random flex failures
-  set(udunits_patch_command
-    ${CMAKE_COMMAND} -E copy_if_different
-      "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/udunits2_apple_configure.in"
-      "${udunits_source}/configure")
-endif()
+#if(APPLE)
+#  # Modified configure file to workaround random flex failures
+#  set(udunits_patch_command
+#    ${CMAKE_COMMAND} -E copy_if_different
+#      "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/udunits2_apple_configure.in"
+#      "${udunits_source}/configure")
+#endif()
 
 ExternalProject_Add(udunits2
   DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}

CMake/cdat_modules/udunits2_pkg.cmake

@@ -1,11 +1,10 @@
 set(UDUNITS2_URL ${LLNL_URL})
-set(UDUNITS2_GZ udunits-${UDUNITS2_MAJOR_SRC}.${UDUNITS2_MINOR_SRC}.${UDUNITS2_PATCH_SRC}.tar.gz)
 set(UDUNITS2_MAJOR_SRC 2)
-set(UDUNITS2_MINOR_SRC 1)
-set(UDUNITS2_PATCH_SRC 24)
+set(UDUNITS2_MINOR_SRC 2)
+set(UDUNITS2_PATCH_SRC 17)
 set(UDUNITS2_URL ${LLNL_URL})
 set(UDUNITS2_GZ udunits-${UDUNITS2_MAJOR_SRC}.${UDUNITS2_MINOR_SRC}.${UDUNITS2_PATCH_SRC}.tar.gz)
-set(UDUNITS2_MD5 6986545721747a51285c765644dcd9d8 )
+set(UDUNITS2_MD5 b81ab8f24125ce18702ab7b3ca4d566f )
 set(UDUNITS2_SOURCE ${UDUNITS2_URL}/${UDUNITS2_GZ})
 
 set (nm UDUNITS2)