diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86ef29c94..6d43b67c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,12 +30,12 @@ SET(PACKAGE_VERSION ${VERSION})
 find_program(UNAME NAMES uname)
 IF(UNAME)
 macro(getuname name flag)
-        exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+    exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
 endmacro(getuname)
 getuname(osname -s)
 getuname(osrel  -r)
 getuname(cpu    -m)
-set(BUILDNAME        "${osname}-${osrel}-${cpu}" CACHE STRING "Build name variable for CDash")
+set(BUILDNAME "${osname}-${osrel}-${cpu}" CACHE STRING "Build name variable for CDash")
 ENDIF()
 
 # Determine if DOXYGEN and DOT are available.  These will be used
@@ -47,7 +47,7 @@ FIND_PROGRAM(NC_DOT NAMES dot)
 INCLUDE(GNUInstallDirs)
 
 IF(MSVC)
-  SET(GLOBAL PROPERTY USE_FOLDERS ON)
+    SET(GLOBAL PROPERTY USE_FOLDERS ON)
 ENDIF()
 
 
@@ -73,8 +73,8 @@ FIND_PACKAGE(MakeDist)
 
 # Set the build type.
 IF (NOT CMAKE_BUILD_TYPE)
-	SET (CMAKE_BUILD_TYPE DEBUG CACHE STRING "Choose the type of build, options are: None, Debug, Release."
-		FORCE)
+  SET(CMAKE_BUILD_TYPE DEBUG CACHE STRING "Choose the type of build, options are: None, Debug, Release."
+      FORCE)
 ENDIF()
 
 ################################
@@ -95,7 +95,7 @@ FILE(COPY ${CMAKE_SOURCE_DIR}/CTestCustom.cmake DESTINATION ${CMAKE_BINARY_DIR})
 # Set Memory test program for non-MSVC based builds.
 # Assume valgrind for now.
 IF(NOT MSVC)
-	SET (CTEST_MEMORYCHECK_COMMAND valgrind CACHE STRING "")
+  SET (CTEST_MEMORYCHECK_COMMAND valgrind CACHE STRING "")
 ENDIF()
 
 # Set variable to define the build type.
@@ -115,10 +115,10 @@ INCLUDE(GenerateExportHeader)
 OPTION(BUILD_SHARED_LIBS "Configure netCDF as a shared library." ON)
 SET (LIB_TYPE STATIC)
 IF (BUILD_SHARED_LIBS)
-	SET(LIB_TYPE SHARED)
-	IF(CMAKE_COMPILER_IS_GNUCC OR APPLE)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-	ENDIF()
+  SET(LIB_TYPE SHARED)
+  IF(CMAKE_COMPILER_IS_GNUCC OR APPLE)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  ENDIF()
 ENDIF()
 
 # Set some default linux gcc & apple compiler options for
@@ -129,7 +129,7 @@ IF(CMAKE_COMPILER_IS_GNUCC OR APPLE)
   OPTION (ENABLE_CONVERSION_WARNINGS "Enable warnings for implicit conversion from 64 to 32-bit datatypes." ON)
   OPTION (ENABLE_USED_VAR_PAR_WARNINGS "Enable warnings for unused parameters and variables. Creates very noisy output." OFF)
   OPTION (ENABLE_LARGE_FILE_TESTS "Enable large file tests." OFF)
-  
+
   # Debugging flags
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall")
@@ -142,15 +142,15 @@ IF(CMAKE_COMPILER_IS_GNUCC OR APPLE)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -profile-arcs -ftest-coverage")
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
-    MESSAGE(STATUS "Coverage Tests: On.")    
+    MESSAGE(STATUS "Coverage Tests: On.")
   ENDIF()
-  
+
   # Unused var and parameter warnings create a lot of noise.
-  IF(NOT ENABLE_UNUSED_VAR_PAR_WARNINGS) 
+  IF(NOT ENABLE_UNUSED_VAR_PAR_WARNINGS)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable -Wno-unused-parameter")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable -Wno-unused-parameter")
   ENDIF()
-  
+
   # Warnings for 64-to-32 bit conversions.
   IF(ENABLE_CONVERSION_WARNINGS)
     IF(CMAKE_COMPILER_IS_GNUCC)
@@ -171,7 +171,7 @@ ADD_DEFINITIONS()
 # Supress CRT Warnings.
 # Only necessary for Windows
 IF(MSVC)
-	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+  ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 ENDIF()
 
 
@@ -196,128 +196,128 @@ ENDMACRO()
 # A basic script used to convert m4 files
 FIND_PROGRAM(NC_M4 NAMES m4)
 MACRO(GEN_m4 filename)
-	IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
-		COMMAND ${NC_M4} 
-		ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 > ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
-		VERBATIM
-	)
-	ENDIF()
+  IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
+    COMMAND ${NC_M4}
+    ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 > ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c
+    VERBATIM
+  )
+  ENDIF()
 ENDMACRO(GEN_m4)
 
 # Binary tests, but ones which depend on value of 'TEMP_LARGE' being defined.
 MACRO(add_bin_env_temp_large_test prefix F)
-	ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
-	TARGET_LINK_LIBRARIES(${prefix}_${F} netcdf)
-	IF(MSVC)
-		SET_TARGET_PROPERTIES(${prefix}_${F} 
-			PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
-			)
-	ENDIF()
+  ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
+  TARGET_LINK_LIBRARIES(${prefix}_${F} netcdf)
+  IF(MSVC)
+    SET_TARGET_PROPERTIES(${prefix}_${F}
+      PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
+      )
+  ENDIF()
 
 
-	ADD_TEST(${prefix}_${F} bash "-c" "TEMP_LARGE=${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${prefix}_${F}")
-	IF(MSVC)
-		SET_PROPERTY(TARGET ${prefix}_${F} PROPERTY FOLDER "tests")
-	ENDIF()
+  ADD_TEST(${prefix}_${F} bash "-c" "TEMP_LARGE=${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${prefix}_${F}")
+  IF(MSVC)
+    SET_PROPERTY(TARGET ${prefix}_${F} PROPERTY FOLDER "tests")
+  ENDIF()
 ENDMACRO()
 
 
 # Tests which are binary, but depend on a particular environmental variable.
 MACRO(add_bin_env_test prefix F)
-	ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
-	TARGET_LINK_LIBRARIES(${prefix}_${F} netcdf)
-	IF(MSVC)
-		SET_TARGET_PROPERTIES(${prefix}_${F} 
-			PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
-			)
-	ENDIF()
+  ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
+  TARGET_LINK_LIBRARIES(${prefix}_${F} netcdf)
+  IF(MSVC)
+    SET_TARGET_PROPERTIES(${prefix}_${F}
+      PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
+      )
+  ENDIF()
 
 
-	ADD_TEST(${prefix}_${F} bash "-c" "TOPSRCDIR=${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${prefix}_${F}")
-	IF(MSVC)
-		SET_PROPERTY(TARGET ${prefix}_${F} PROPERTY FOLDER "tests")
-	ENDIF()
+  ADD_TEST(${prefix}_${F} bash "-c" "TOPSRCDIR=${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${prefix}_${F}")
+  IF(MSVC)
+    SET_PROPERTY(TARGET ${prefix}_${F} PROPERTY FOLDER "tests")
+  ENDIF()
 ENDMACRO()
 
 # Build a binary used by a script, but don't make a test out of it.
-MACRO(build_bin_test F) 
-	ADD_EXECUTABLE(${F} ${F}.c)
-	TARGET_LINK_LIBRARIES(${F} netcdf)
-	IF(MSVC)
-		SET_TARGET_PROPERTIES(${F} 
-			PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
-		)
-	ENDIF()
+MACRO(build_bin_test F)
+  ADD_EXECUTABLE(${F} ${F}.c)
+  TARGET_LINK_LIBRARIES(${F} netcdf)
+  IF(MSVC)
+    SET_TARGET_PROPERTIES(${F}
+      PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
+    )
+  ENDIF()
 ENDMACRO()
 
 # Binary tests which are used by a script looking for a specific name.
 MACRO(add_bin_test_no_prefix F)
-	build_bin_test(${F})
-	ADD_TEST(${F} ${EXECUTABLE_OUTPUT_PATH}/${F})
-	IF(MSVC)
-		SET_PROPERTY(TEST ${F} PROPERTY FOLDER "tests/")
-	ENDIF()	
+  build_bin_test(${F})
+  ADD_TEST(${F} ${EXECUTABLE_OUTPUT_PATH}/${F})
+  IF(MSVC)
+    SET_PROPERTY(TEST ${F} PROPERTY FOLDER "tests/")
+  ENDIF()
 ENDMACRO()
 
 # Binary tests which are used by a script looking for a specific name.
 MACRO(build_bin_test_no_prefix F)
-	build_bin_test(${F})
-	ADD_TEST(${F} ${EXECUTABLE_OUTPUT_PATH}/${F})
-	IF(MSVC)
-		SET_PROPERTY(TEST ${F} PROPERTY FOLDER "tests/")
-	ENDIF()	
+  build_bin_test(${F})
+  ADD_TEST(${F} ${EXECUTABLE_OUTPUT_PATH}/${F})
+  IF(MSVC)
+    SET_PROPERTY(TEST ${F} PROPERTY FOLDER "tests/")
+  ENDIF()
 ENDMACRO()
 
 
 MACRO(add_bin_test prefix F)
-	ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
-	TARGET_LINK_LIBRARIES(${prefix}_${F} netcdf)
-	IF(MSVC)
-		SET_TARGET_PROPERTIES(${prefix}_${F} 
-			PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
-			)
-	ENDIF()
-	ADD_TEST(${prefix}_${F} ${EXECUTABLE_OUTPUT_PATH}/${prefix}_${F})
-	IF(MSVC)
-		SET_PROPERTY(TEST ${prefix}_${F} PROPERTY FOLDER "tests/")
-	ENDIF()	
+  ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
+  TARGET_LINK_LIBRARIES(${prefix}_${F} netcdf)
+  IF(MSVC)
+    SET_TARGET_PROPERTIES(${prefix}_${F}
+      PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
+      )
+  ENDIF()
+  ADD_TEST(${prefix}_${F} ${EXECUTABLE_OUTPUT_PATH}/${prefix}_${F})
+  IF(MSVC)
+    SET_PROPERTY(TEST ${prefix}_${F} PROPERTY FOLDER "tests/")
+  ENDIF()
 ENDMACRO()
 
 # A script to print out information at the end of the configuration step.
 MACRO(print_conf_summary)
-	MESSAGE("")
-	MESSAGE("")
-	MESSAGE("Configuration Summary:")
-	MESSAGE("")
-	MESSAGE(STATUS "\tBuild Type:\t\t\t" ${CMAKE_BUILD_TYPE})
-	MESSAGE(STATUS "\tBuilding Shared Libraries:\t" ${BUILD_SHARED_LIBS})
-	MESSAGE(STATUS "\tBuilding netCDF-4:\t\t" ${ENABLE_NETCDF_4})
-	MESSAGE(STATUS "\tBuilding DAP Support:\t\t" ${ENABLE_DAP})
-	MESSAGE(STATUS "\tBuilding Utilities:\t\t" ${BUILD_UTILITIES})
-	IF(CMAKE_PREFIX_PATH)
-		MESSAGE(STATUS "\tCMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}")
-	ENDIF()
-	MESSAGE(STATUS "\tUsing pnetcdf:\t\t\t" ${STATUS_PNETCDF})
-	MESSAGE(STATUS "\tUsing Parallel IO:\t\t" ${STATUS_PARALLEL})
-	MESSAGE("")
-	MESSAGE(STATUS "Compiler:")
-	MESSAGE("")
-	MESSAGE(STATUS "CMAKE_C_COMPILER:\t\t ${CMAKE_C_COMPILER}")
-	MESSAGE(STATUS "CMAKE_C_FLAGS:\t\t" ${CMAKE_C_FLAGS})
-	MESSAGE(STATUS "CMAKE_CXX_FLAGS:\t\t" ${CMAKE_CXX_FLAGS})
+  MESSAGE("")
+  MESSAGE("")
+  MESSAGE("Configuration Summary:")
+  MESSAGE("")
+  MESSAGE(STATUS "\tBuild Type:\t\t\t" ${CMAKE_BUILD_TYPE})
+  MESSAGE(STATUS "\tBuilding Shared Libraries:\t" ${BUILD_SHARED_LIBS})
+  MESSAGE(STATUS "\tBuilding netCDF-4:\t\t" ${ENABLE_NETCDF_4})
+  MESSAGE(STATUS "\tBuilding DAP Support:\t\t" ${ENABLE_DAP})
+  MESSAGE(STATUS "\tBuilding Utilities:\t\t" ${BUILD_UTILITIES})
+  IF(CMAKE_PREFIX_PATH)
+    MESSAGE(STATUS "\tCMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}")
+  ENDIF()
+  MESSAGE(STATUS "\tUsing pnetcdf:\t\t\t" ${STATUS_PNETCDF})
+  MESSAGE(STATUS "\tUsing Parallel IO:\t\t" ${STATUS_PARALLEL})
+  MESSAGE("")
+  MESSAGE(STATUS "Compiler:")
+  MESSAGE("")
+  MESSAGE(STATUS "CMAKE_C_COMPILER:\t\t ${CMAKE_C_COMPILER}")
+  MESSAGE(STATUS "CMAKE_C_FLAGS:\t\t" ${CMAKE_C_FLAGS})
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS:\t\t" ${CMAKE_CXX_FLAGS})
 
-	MESSAGE(STATUS "Linking against:\t\t" "${ALL_TLL_LIBS}") 
+  MESSAGE(STATUS "Linking against:\t\t" "${ALL_TLL_LIBS}")
 
-	MESSAGE("")
+  MESSAGE("")
 
 ENDMACRO()
 # Shell script Macro
 MACRO(add_sh_test prefix F)
-	IF(NOT MSVC)
-		ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh")
-	ENDIF()
+  IF(NOT MSVC)
+    ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh")
+  ENDIF()
 
 ENDMACRO()
 
@@ -327,11 +327,11 @@ ENDMACRO()
 # CRT libs, MT tells VS to use the static CRT libs.
 #
 # Taken From:
-# 	http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
+#   http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
 #
-MACRO(specify_static_crt_flag) 
+MACRO(specify_static_crt_flag)
 
-  SET(vars 
+  SET(vars
     CMAKE_C_FLAGS
     CMAKE_C_FLAGS_DEBUG
     CMAKE_C_FLAGS_MINSIZEREL
@@ -339,13 +339,13 @@ MACRO(specify_static_crt_flag)
     CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG
     CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
     CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-  
+
   FOREACH(flag_var ${vars})
     IF(${flag_var} MATCHES "/MD")
       STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
     ENDIF()
-  ENDFOREACH()			    
-  
+  ENDFOREACH()
+
   FOREACH(flag_var ${vars})
     MESSAGE(STATUS " '${flag_var}': ${${flag_var}}")
   ENDFOREACH()
@@ -363,31 +363,31 @@ ENDMACRO()
 # Adapted from http://www.cmake.org/Wiki/CMake_RPATH_handling
 ##
 IF(NOT MSVC)
-	# use, i.e. don't skip the full RPATH for the build tree
-	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+  # use, i.e. don't skip the full RPATH for the build tree
+  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 
-	# when building, don't use the install RPATH already
-	# (but later on when installing)
-	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+  # when building, don't use the install RPATH already
+  # (but later on when installing)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
-	# Stanza for Apple RPATH.
-	# See: http://www.cmake.org/pipermail/cmake/2011-April/043826.html
-	# 
-	IF(APPLE)
-	  SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-	ENDIF(APPLE)
+  # Stanza for Apple RPATH.
+  # See: http://www.cmake.org/pipermail/cmake/2011-April/043826.html
+  #
+  IF(APPLE)
+    SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+  ENDIF(APPLE)
 
-	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 
-	# add the automatically determined parts of the RPATH
-	# which point to directories outside the build tree to the install RPATH
-	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  # add the automatically determined parts of the RPATH
+  # which point to directories outside the build tree to the install RPATH
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-	# the RPATH to be used when installing, but only if it's not a system directory
-	LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
-	IF("${isSystemDir}" STREQUAL "-1")
-		SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-	ENDIF("${isSystemDir}" STREQUAL "-1")
+  # the RPATH to be used when installing, but only if it's not a system directory
+  LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+  IF("${isSystemDir}" STREQUAL "-1")
+    SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+  ENDIF("${isSystemDir}" STREQUAL "-1")
 ENDIF()
 
 ##
@@ -408,11 +408,11 @@ SET (CHUNK_CACHE_SIZE 4194304 CACHE STRING "Default Chunk Cache Size.")
 SET (CHUNK_CACHE_NELEMS 1009 CACHE STRING "Default maximum number of elements in cache.")
 SET (CHUNK_CACHE_PREEMPTION 0.75 CACHE STRING "Default file chunk cache preemption policy for HDf5 files (a number between 0 and 1, inclusive.")
 SET (MAX_DEFAULT_CACHE_SIZE 67108864 CACHE STRING "Default maximum cache size.")
-SET (NETCDF_LIB_NAME "" CACHE STRING "Default name of the netcdf library.") 
+SET (NETCDF_LIB_NAME "" CACHE STRING "Default name of the netcdf library.")
 SET (TEMP_LARGE "." CACHE STRING "Where to put large temp files if large file tests are run.")
 
 IF(NOT NETCDF_LIB_NAME STREQUAL "")
-	SET(MOD_NETCDF_NAME ON)
+  SET(MOD_NETCDF_NAME ON)
 ENDIF()
 
 # Option to use a local or remote CDash instance.
@@ -421,7 +421,7 @@ OPTION (USE_REMOTE_CDASH "Use CDash instance at CDash.org." OFF)
 
 # Set the appropriate compiler/architecture for universal OSX binaries.
 IF(${CMAKE_SYSTEM_NAME} EQUAL "Darwin")
-	SET(CMAKE_OSX_ARCHITECTURES i386;x86_64)
+  SET(CMAKE_OSX_ARCHITECTURES i386;x86_64)
 ENDIF(${CMAKE_SYSTEM_NAME} EQUAL "Darwin")
 
 
@@ -439,18 +439,18 @@ OPTION (BUILD_V2 "Build netCDF Version 2." ON)
 
 # Option to build utilities
 OPTION (BUILD_UTILITIES "Build ncgen, ncgen3, ncdump." ON)
-	
+
 # Option to use MMAP
 OPTION (ENABLE_MMAP "Use MMAP." OFF)
 IF(ENABLE_MMAP)
-	IF(NOT HAVE_MREMAP)
-		MESSAGE(STATUS "mremap not found: disabling MMAP support.")
-		SET(ENABLE_MMAP OFF)
-	ELSE()
-		SET(HAVE_MMAP ON)
-		SET(BUILD_MMAP ON)
-		SET(USE_MMAP ON)
-	ENDIF()
+  IF(NOT HAVE_MREMAP)
+    MESSAGE(STATUS "mremap not found: disabling MMAP support.")
+    SET(ENABLE_MMAP OFF)
+  ELSE()
+    SET(HAVE_MMAP ON)
+    SET(BUILD_MMAP ON)
+    SET(USE_MMAP ON)
+  ENDIF()
 ENDIF()
 
 
@@ -461,43 +461,43 @@ OPTION (ENABLE_EXAMPLES "Build Examples" ON)
 # Option to use Diskless
 OPTION (ENABLE_DISKLESS "Build Diskless." ON)
 IF(ENABLE_DISKLESS)
-	SET(BUILD_DISKLESS ON)
-	SET(USE_DISKLESS ON)
+  SET(BUILD_DISKLESS ON)
+  SET(USE_DISKLESS ON)
 ENDIF()
 
-# Option Logging, only valid for netcdf4. 
+# Option Logging, only valid for netcdf4.
 OPTION (ENABLE_LOGGING "Enable Logging." OFF)
 IF(ENABLE_LOGGING)
-	SET(LOGGING ON)
+  SET(LOGGING ON)
 ENDIF()
 # Option to use HDF4
 OPTION (ENABLE_HDF4 "Build netCDF-4 with HDF5 read capability (HDF4, HDF5 and Zlib required)." OFF)
-IF (ENABLE_HDF4) 
-   SET(USE_HDF4 ON) 
+IF (ENABLE_HDF4)
+   SET(USE_HDF4 ON)
    # Check for include files, libraries.
 
    FIND_PATH(MFHDF_H_INCLUDE_DIR mfhdf.h)
    IF(NOT MFHDF_H_INCLUDE_DIR)
-	MESSAGE(FATAL_ERROR "HDF4 Support specified, cannot find file mfhdf.h")
+  MESSAGE(FATAL_ERROR "HDF4 Support specified, cannot find file mfhdf.h")
    ELSE()
      SET(HAVE_MFHDF_H ON CACHE BOOL "")
      INCLUDE_DIRECTORIES(${MFHDF_H_INCLUDE_DIR})
-   ENDIF() 
- 
+   ENDIF()
+
    FIND_LIBRARY(HDF4_DF_LIB NAMES df libdf hdf)
    IF(NOT HDF4_DF_LIB)
-	MESSAGE(FATAL_ERROR "Can't find or link to the hdf4 df library.")
+  MESSAGE(FATAL_ERROR "Can't find or link to the hdf4 df library.")
    ENDIF()
 
    FIND_LIBRARY(HDF4_MFHDF_LIB NAMES mfhdf libmfhdf)
    IF(NOT HDF4_MFHDF_LIB)
-	MESSAGE(FATAL_ERROR "Can't find or link to the hdf4 mfhdf library.")
+  MESSAGE(FATAL_ERROR "Can't find or link to the hdf4 mfhdf library.")
    ENDIF()
 
    SET(HDF4_LIBRARIES ${HDF4_MFHDF_LIB} ${HDF4_DF_LIB})
    # End include files, libraries.
    MESSAGE(STATUS "HDF4 libraries: ${HDF4_DF_LIB}, ${HDF4_MFHDF_LIB}")
-   
+
    MESSAGE(STATUS "Seeking HDF4 jpeg dependency.")
 
    # Look for the jpeglib.h header file.
@@ -515,7 +515,7 @@ IF (ENABLE_HDF4)
    ENDIF()
    SET(HDF4_LIBRARIES ${JPEG_LIB} ${HDF4_LIBRARIES})
    MESSAGE(STATUS "Found JPEG libraries: ${JPEG_LIB}")
-   
+
    # Option to enable HDF4 file tests.
    OPTION(ENABLE_HDF4_FILE_TESTS "Run HDF4 file tests.  This fetches sample HDF4 files from the Unidata ftp site to test with (requires wget)." ON)
    IF(ENABLE_HDF4_FILE_TESTS)
@@ -526,19 +526,19 @@ IF (ENABLE_HDF4)
        MESSAGE(STATUS "Unable to locate 'wget'.  Disabling hdf4 file tests.")
        SET(USE_HDF4_FILE_TESTS OFF)
      ENDIF()
-     
+
    ENDIF()
-   
+
  ENDIF ()
 
 # Option to Build DLL
 IF(WIN32)
-	OPTION (ENABLE_DLL "Build a Windows DLL." ${BUILD_SHARED_LIBS})
-	IF (ENABLE_DLL)
-  		SET(BUILD_DLL ON CACHE BOOL "")
-		ADD_DEFINITIONS(-DDLL_NETCDF)
-  		ADD_DEFINITIONS(-DDLL_EXPORT)
-	ENDIF ()
+  OPTION (ENABLE_DLL "Build a Windows DLL." ${BUILD_SHARED_LIBS})
+  IF (ENABLE_DLL)
+      SET(BUILD_DLL ON CACHE BOOL "")
+    ADD_DEFINITIONS(-DDLL_NETCDF)
+      ADD_DEFINITIONS(-DDLL_EXPORT)
+  ENDIF ()
 ENDIF()
 # Did the user specify a default minimum blocksize for posixio?
 SET (NCIO_MINBLOCKSIZE 256 CACHE STRING "Minimum I/O Blocksize for netCDF classic and 64-bit offset format files.")
@@ -546,15 +546,15 @@ SET (NCIO_MINBLOCKSIZE 256 CACHE STRING "Minimum I/O Blocksize for netCDF classi
 # Build netCDF4
 OPTION (ENABLE_NETCDF_4 "Enable netCDF-4" ON)
 IF(ENABLE_NETCDF_4)
-	SET(USE_NETCDF4 ON CACHE BOOL "")
-	SET(ENABLE_NETCDF_4 ON CACHE BOOL "")
-	SET(ENABLE_NETCDF4 ON CACHE BOOL "")
+  SET(USE_NETCDF4 ON CACHE BOOL "")
+  SET(ENABLE_NETCDF_4 ON CACHE BOOL "")
+  SET(ENABLE_NETCDF4 ON CACHE BOOL "")
 ENDIF()
 
 # Option for building RPC
 OPTION (ENABLE_RPC OFF "Enable RPC Client and Server.")
 IF(ENABLE_RPC)
-	SET(BUILD_RPC ON CACHE BOOL "")
+  SET(BUILD_RPC ON CACHE BOOL "")
 ENDIF()
 
 # Option to Enable HDF5
@@ -568,14 +568,20 @@ ENDIF()
 IF (USE_HDF5 OR ENABLE_NETCDF_4)
   SET(USE_HDF5 ON)
   SET(USE_NETCDF4 ON)
-
   # Accomodate developers who have hdf5 libraries and
   # headers on their system, but do not have a the hdf
   # .cmake files.  If this is the case, they should
   # specify HDF5_HL_LIB, HDF5_LIB, HDF5_INCLUDE_DIR manually.
   IF(HDF5_LIB AND HDF5_HL_LIB AND HDF5_INCLUDE_DIR)
-	SET(HDF5_LIBRARIES ${HDF5_LIB} ${HDF5_HL_LIB})
-  	SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
+    SET(HDF5_LIBRARIES ${HDF5_LIB} ${HDF5_HL_LIB})
+    SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
+    # Find out if HDF5 was built with parallel support.
+    # Do that by checking for the targets H5Pget_fapl_mpiposx and
+    # H5Pget_fapl_mpio in ${HDF5_LIB}.
+    CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpioposix "" HDF5_IS_PARALLEL)
+    IF(NOT HDF5_IS_PARALLEL)
+      CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL)
+    ENDIF()
   ELSE()
     IF(MSVC)
       FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED)
@@ -583,11 +589,10 @@ IF (USE_HDF5 OR ENABLE_NETCDF_4)
     ELSE()
       FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
     ENDIF()
-
   ENDIF()
-  
+
   INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS})
-  
+
   # Starting with hdf5 1.8.11, dynamic loading is an option.
   # In case hdf5 has a dependency on libdl, the user must specify
   # -DENABLE_DYNAMIC_LOADING=ON when configuring netcdf.
@@ -608,20 +613,20 @@ IF (USE_HDF5 OR ENABLE_NETCDF_4)
 
   #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.
   IF(USE_SZIP)
-	FIND_PACKAGE(SZIP NO_MODULE)
-	INCLUDE_DIRECTORIES(${SZIP_INCLUDE_DIR})
+  FIND_PACKAGE(SZIP NO_MODULE)
+  INCLUDE_DIRECTORIES(${SZIP_INCLUDE_DIR})
   ENDIF()
-	
+
   SET(H5_USE_16_API 1)
-  OPTION(NC_ENABLE_HDF_16_API "Enable HDF5 1.6.x Compatibility (Required)" ON)  
+  OPTION(NC_ENABLE_HDF_16_API "Enable HDF5 1.6.x Compatibility (Required)" ON)
   IF(NOT NC_ENABLE_HDF_16_API)
     SET(H5_USE_16_API 0)
   ENDIF()
-  
+
   # Check for ZLib, but only if using HDF5.
   FIND_PACKAGE(ZLIB)
   IF(NOT ZLIB_LIBRARY)
-	MESSAGE(FATAL_ERROR "HDF5 Support specified, cannot find ZLib.")
+  MESSAGE(FATAL_ERROR "HDF5 Support specified, cannot find ZLib.")
   ENDIF()
   SET(USE_ZLIB ON)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
@@ -630,13 +635,13 @@ ENDIF ()
 # Option to Build DAP Client
 OPTION (ENABLE_DAP "Enable DAP Client." ON)
 IF (ENABLE_DAP)
-	SET(USE_DAP ON)
-	FIND_PACKAGE(CURL)
-	IF(NOT CURL_LIBRARY)
-		MESSAGE(FATAL_ERROR "DAP Support specified, CURL libraries are not found.")
-	ENDIF()
-	ADD_DEFINITIONS(-DCURL_STATICLIB=1)
-	INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+  SET(USE_DAP ON)
+  FIND_PACKAGE(CURL)
+  IF(NOT CURL_LIBRARY)
+    MESSAGE(FATAL_ERROR "DAP Support specified, CURL libraries are not found.")
+  ENDIF()
+  ADD_DEFINITIONS(-DCURL_STATICLIB=1)
+  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 ENDIF()
 
 # Check for the math library so it can be explicitely linked.
@@ -644,7 +649,7 @@ IF(NOT WIN32)
        FIND_LIBRARY(HAVE_LIBM NAMES math m libm)
        MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}")
        IF(NOT HAVE_LIBM)
-       	      MESSAGE(FATAL_ERROR "Unable to find the math library.")
+              MESSAGE(FATAL_ERROR "Unable to find the math library.")
        ENDIF()
 ENDIF()
 
@@ -653,41 +658,41 @@ OPTION(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF)
 OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
 
 # If netCDF4 and DAP, Option for DAP groups.
-IF(ENABLE_NETCDF_4 AND USE_DAP)		
-		  OPTION(ENABLE_DAP_GROUPS "Whether netcdf4 group names should be enabled." ON)
+IF(ENABLE_NETCDF_4 AND USE_DAP)
+      OPTION(ENABLE_DAP_GROUPS "Whether netcdf4 group names should be enabled." ON)
 ELSE()
-	SET(ENABLE_DAP_GROUPS OFF CACHE BOOL "Whether netcdf4 group names should be enabled.")
+  SET(ENABLE_DAP_GROUPS OFF CACHE BOOL "Whether netcdf4 group names should be enabled.")
 ENDIF()
 
 
 # Enable some developer-only tests
 OPTION(ENABLE_EXTRA_TESTS "Enable Extra tests. Some may not work because of known issues. Developers only." OFF)
 IF(ENABLE_EXTRA_TESTS)
-	SET(EXTRA_TESTS ON)
+  SET(EXTRA_TESTS ON)
 ENDIF()
 
 # Option to use bundled XGetopt in place of getopt(). This is mostly useful
 # for MSVC builds. If not building utilities, getopt() isn't required at all.
 IF(MSVC)
-	OPTION(ENABLE_XGETOPT "Enable bundled XGetOpt instead of external getopt()." ON)
-	IF(ENABLE_XGETOPT)
-		SET(USE_X_GETOPT ON CACHE BOOL "")
-	ENDIF()
+  OPTION(ENABLE_XGETOPT "Enable bundled XGetOpt instead of external getopt()." ON)
+  IF(ENABLE_XGETOPT)
+    SET(USE_X_GETOPT ON CACHE BOOL "")
+  ENDIF()
 ENDIF()
 
 SET(MATH "")
 IF(NOT WIN32)
-	# FFIO insteaad of PosixIO
-	OPTION(ENABLE_FFIO "If true, use ffio instead of posixio" OFF)
-	IF(ENABLE_FFIO)
-		SET(USE_FFIO ON CACHE BOOL "")
-	ENDIF()
+  # FFIO insteaad of PosixIO
+  OPTION(ENABLE_FFIO "If true, use ffio instead of posixio" OFF)
+  IF(ENABLE_FFIO)
+    SET(USE_FFIO ON CACHE BOOL "")
+  ENDIF()
 ENDIF()
 
 # Enable Tests
 #IF(NOT MSVC)
 OPTION (ENABLE_TESTS "Enable basic tests, run with 'make test'." ON)
-IF(ENABLE_TESTS) 
+IF(ENABLE_TESTS)
  SET(BUILD_TESTSETS ON CACHE BOOL "")
 ENDIF()
 
@@ -701,7 +706,7 @@ SET(TEMP_LARGE "." CACHE STRING "Location to store large file tests.")
 
 OPTION (ENABLE_FSYNC "Enable experimental fsync code." OFF)
 IF(ENABLE_FSYNC)
-	SET(USE_FSYNC ON)
+  SET(USE_FSYNC ON)
 ENDIF()
 
 # Linux specific large file support flags.
@@ -722,45 +727,38 @@ ENDIF()
 
 OPTION (ENABLE_EXAMPLE_TESTS "Run extra example tests.  Requires GNU Sed. Ignored if netCDF-4 is not Enabled" OFF)
 IF(NOT ENABLE_NETCDF_4 AND ENABLE_EXAMPLE_TESTS)
-	SET (ENABLE_EXAMPLE_TESTS OFF)
+  SET (ENABLE_EXAMPLE_TESTS OFF)
 ENDIF()
 
 # Enable Parallel (different than pnetcdf).
 SET(STATUS_PARALLEL "OFF")
 OPTION(ENABLE_PARALLEL "Build netCDF-4 with parallel IO" OFF)
 IF(ENABLE_PARALLEL AND ENABLE_NETCDF_4)
-	SET(USE_PARALLEL ON CACHE BOOL "")
-	# Check for H5Pget_fapl_mpiposx, define USE_PARALLEL_POSIX
-	CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpioposix "" USE_PARALLEL_POSIX)	
-		
-	# Else Check for H5Pget_fapl_mpio, define USE_PARALLEL_MPIO
-	IF(NOT USE_PARALLEL_POSIX)
-	       CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpio "" USE_PARALLEL_MPIO)
-	ENDIF()
-	
-	IF(NOT USE_PARALLEL_POSIX AND NOT USE_PARALLEL_MPIO)
-		SET(USE_PARALLEL OFF CACHE BOOL "")
-		MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.")
-	ENDIF()
-	SET(STATUS_PARALLEL "ON")
+  SET(USE_PARALLEL ON CACHE BOOL "")
+  IF(NOT HDF5_IS_PARALLEL)
+    SET(USE_PARALLEL OFF CACHE BOOL "")
+    MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.")
+  ELSE()
+    SET(STATUS_PARALLEL "ON")
+  ENDIF()
 ENDIF()
 
 # Options to enable parallel IO, tests.
 SET(STATUS_PNETCDF "OFF")
 OPTION(ENABLE_PNETCDF "Build with parallel I/O for classic and 64-bit offset files using parallel-netcdf." OFF)
 IF(ENABLE_PNETCDF)
-	# Check for ncmpi_create in libpnetcdf, define USE_PNETCDF
-	# Does the user want to turn on PNETCDF read ability?
-	SET(USE_PNETCDF ON CACHE BOOL "")	
-	FIND_LIBRARY(PNETCDF NAMES pnetcdf)
-	FIND_PATH(PNETCDF_INCLUDE_DIR pnetcdf.h)
-	IF(NOT PNETCDF)
-		MESSAGE(STATUS "Cannot find pnetcdf library. Disabling pnetcdf support.")
-		SET(USE_PNETCDF OFF CACHE BOOL "")
-	ENDIF()
-	SET(STATUS_PNETCDF "ON")	
-	INCLUDE_DIRECTORIES(${PNETCDF_INCLUDE_DIR})
-	SET(HAVE_LIBPNETCDF ON)
+  # Check for ncmpi_create in libpnetcdf, define USE_PNETCDF
+  # Does the user want to turn on PNETCDF read ability?
+  SET(USE_PNETCDF ON CACHE BOOL "")
+  FIND_LIBRARY(PNETCDF NAMES pnetcdf)
+  FIND_PATH(PNETCDF_INCLUDE_DIR pnetcdf.h)
+  IF(NOT PNETCDF)
+    MESSAGE(STATUS "Cannot find pnetcdf library. Disabling pnetcdf support.")
+    SET(USE_PNETCDF OFF CACHE BOOL "")
+  ENDIF()
+  SET(STATUS_PNETCDF "ON")
+  INCLUDE_DIRECTORIES(${PNETCDF_INCLUDE_DIR})
+  SET(HAVE_LIBPNETCDF ON)
         # pnetcdf => parallel
         SET(STATUS_PARALLEL "ON")
 ENDIF()
@@ -768,7 +766,7 @@ ENDIF()
 # Enable Parallel Tests.
 OPTION (ENABLE_PARALLEL_TESTS "Enable Parallel IO Tests. Ignored if netCDF4 is not enabled, or if there is no parallel I/O Support." ${USE_PARALLEL})
 IF(ENABLE_PARALLEL_TESTS AND USE_PARALLEL)
-	SET(TEST_PARALLEL ON CACHE BOOL "")
+  SET(TEST_PARALLEL ON CACHE BOOL "")
 ENDIF()
 
 # Determine whether or not to generate documentation.
@@ -776,7 +774,7 @@ OPTION (ENABLE_DOXYGEN "Enable generation of doxygen." OFF)
 IF(ENABLE_DOXYGEN)
   IF(NC_DOXYGEN)
     SET(BUILD_DOCS ON CACHE BOOL "")
-    
+
     # Offer the option to build internal documentation.
     OPTION(ENABLE_INTERNAL_DOCS "Build internal documentation. This is of interest to developers only." OFF)
     IF(ENABLE_INTERNAL_DOCS)
@@ -804,7 +802,7 @@ IF(ENABLE_DOXYGEN)
   ELSE(NC_DOXYGEN)
     MESSAGE(STATUS "Unable to build internal documentation.  Doxygen does not appear to be on your executable path. Install doxygen and configure the project again.")
   ENDIF(NC_DOXYGEN)
-	
+
 
 ENDIF()
 
@@ -812,7 +810,7 @@ ENDIF()
 # Allow a user to override this.
 IF(MSVC)
   SET(NC_MSVC_STACK_SIZE 40000000 CACHE STRING "Default stack size for MSVC-based projects.")
-  
+
   # By default, CMake sets the stack to 1000000.
   # Remove this limitation.
   # See here for more details:
@@ -820,7 +818,7 @@ IF(MSVC)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:${NC_MSVC_STACK_SIZE}")
   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /STACK:${NC_MSVC_STACK_SIZE}")
   SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /STACK:${NC_MSVC_STACK_SIZE}")
-  
+
 ENDIF()
 
 
@@ -845,60 +843,60 @@ SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/libsrc)
 #
 # Library include checks
 CHECK_INCLUDE_FILE("math.h"      HAVE_MATH_H)
-CHECK_INCLUDE_FILE("unistd.h"	 HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE("unistd.h"  HAVE_UNISTD_H)
 # Solve a compatibility issue in ncgen/, which checks
 # for NO_UNISTD_H
 IF(NOT HAVE_UNISTD_H)
-	SET(YY_NO_UNISTD_H TRUE)
+  SET(YY_NO_UNISTD_H TRUE)
 ENDIF()
 
-CHECK_INCLUDE_FILE("alloca.h"	 HAVE_ALLOCA_H)
+CHECK_INCLUDE_FILE("alloca.h"  HAVE_ALLOCA_H)
 CHECK_INCLUDE_FILE("malloc.h"    HAVE_MALLOC_H)
-CHECK_INCLUDE_FILE("ctype.h"	 HAVE_CTYPE_H)
-CHECK_INCLUDE_FILE("dirent.h"	 HAVE_DIRENT_H)
-CHECK_INCLUDE_FILE("dlfcn.h"	 HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE("errno.h"	 HAVE_ERRNO_H)
-CHECK_INCLUDE_FILE("fcntl.h"	 HAVE_FCNTL_H)
-CHECK_INCLUDE_FILE("getopt.h"	 HAVE_GETOPT_H)
-CHECK_INCLUDE_FILE("stdbool.h"	 HAVE_STDBOOL_H)
-CHECK_INCLUDE_FILE("locale.h"	 HAVE_LOCAL_H)
-CHECK_INCLUDE_FILE("stdint.h"	 HAVE_STDINT_H)
-CHECK_INCLUDE_FILE("stdio.h"	 HAVE_STDIO_H)
-CHECK_INCLUDE_FILE("stdlib.h"	 HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("ctype.h"   HAVE_CTYPE_H)
+CHECK_INCLUDE_FILE("dirent.h"  HAVE_DIRENT_H)
+CHECK_INCLUDE_FILE("dlfcn.h"   HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE("errno.h"   HAVE_ERRNO_H)
+CHECK_INCLUDE_FILE("fcntl.h"   HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE("getopt.h"  HAVE_GETOPT_H)
+CHECK_INCLUDE_FILE("stdbool.h"   HAVE_STDBOOL_H)
+CHECK_INCLUDE_FILE("locale.h"  HAVE_LOCAL_H)
+CHECK_INCLUDE_FILE("stdint.h"  HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdio.h"   HAVE_STDIO_H)
+CHECK_INCLUDE_FILE("stdlib.h"  HAVE_STDLIB_H)
 CHECK_INCLUDE_FILE("stdarg.h"    HAVE_STDARG_H)
-CHECK_INCLUDE_FILE("strings.h"	 HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("signal.h" 	 HAVE_SIGNAL_H)
-CHECK_INCLUDE_FILE("sys/dir.h"	 HAVE_SYS_DIR_H)
-CHECK_INCLUDE_FILE("sys/ndir.h"	 HAVE_SYS_NDIR_H)
+CHECK_INCLUDE_FILE("strings.h"   HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("signal.h"    HAVE_SIGNAL_H)
+CHECK_INCLUDE_FILE("sys/dir.h"   HAVE_SYS_DIR_H)
+CHECK_INCLUDE_FILE("sys/ndir.h"  HAVE_SYS_NDIR_H)
 CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
-CHECK_INCLUDE_FILE("sys/stat.h"	 HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILE("sys/time.h"	 HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILE("sys/stat.h"  HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("sys/time.h"  HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE("sys/wait.h"	 HAVE_SYS_WAIT_H)
+CHECK_INCLUDE_FILE("sys/wait.h"  HAVE_SYS_WAIT_H)
 CHECK_INCLUDE_FILE("sys/resource.h" HAVE_SYS_RESOURCE_H)
-CHECK_INCLUDE_FILE("fcntl.h"	HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE("fcntl.h"  HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE("inttypes.h"  HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE("pstdint.h"	HAVE_PSTDINT_H)
-CHECK_INCLUDE_FILE("endian.h"	HAVE_ENDIAN_H)
+CHECK_INCLUDE_FILE("pstdint.h"  HAVE_PSTDINT_H)
+CHECK_INCLUDE_FILE("endian.h" HAVE_ENDIAN_H)
 CHECK_INCLUDE_FILE("BaseTsd.h"  HAVE_BASETSD_H)
 CHECK_INCLUDE_FILE("stddef.h"   HAVE_STDDEF_H)
 
 # Type checks
-CHECK_TYPE_SIZE("double"	 SIZEOF_DOUBLE)
-CHECK_TYPE_SIZE("float"		 SIZEOF_FLOAT)
-CHECK_TYPE_SIZE("int"		 SIZEOF_INT)
-CHECK_TYPE_SIZE("long"		 SIZEOF_LONG)
-CHECK_TYPE_SIZE("long long"	 SIZEOF_LONG_LONG)
-CHECK_TYPE_SIZE("off_t"		 SIZEOF_OFF_T)
+CHECK_TYPE_SIZE("double"   SIZEOF_DOUBLE)
+CHECK_TYPE_SIZE("float"    SIZEOF_FLOAT)
+CHECK_TYPE_SIZE("int"    SIZEOF_INT)
+CHECK_TYPE_SIZE("long"     SIZEOF_LONG)
+CHECK_TYPE_SIZE("long long"  SIZEOF_LONG_LONG)
+CHECK_TYPE_SIZE("off_t"    SIZEOF_OFF_T)
 CHECK_TYPE_SIZE("off64_t"        SIZEOF_OFF64_T)
-CHECK_TYPE_SIZE("short"		 SIZEOF_SHORT)
-CHECK_TYPE_SIZE("size_t"	 SIZEOF_SIZE_T)
-CHECK_TYPE_SIZE("ssize_t"	 SIZEOF_SSIZE_T)
+CHECK_TYPE_SIZE("short"    SIZEOF_SHORT)
+CHECK_TYPE_SIZE("size_t"   SIZEOF_SIZE_T)
+CHECK_TYPE_SIZE("ssize_t"  SIZEOF_SSIZE_T)
 # __int64 is used on Windows for large file support.
 CHECK_TYPE_SIZE("__int64"        SIZEOF___INT_64)
-CHECK_TYPE_SIZE("uchar"		 SIZEOF_UCHAR)
-CHECK_TYPE_SIZE("int64_t"	 SIZEOF_INT64_T)
-CHECK_TYPE_SIZE("uint64_t"	 SIZEOF_UINT64_T)
+CHECK_TYPE_SIZE("uchar"    SIZEOF_UCHAR)
+CHECK_TYPE_SIZE("int64_t"  SIZEOF_INT64_T)
+CHECK_TYPE_SIZE("uint64_t"   SIZEOF_UINT64_T)
 
 # On windows systems, we redefine off_t as __int64
 # to enable LFS. This is true on 32 and 64 bit system.s
@@ -908,39 +906,39 @@ IF(MSVC AND SIZEOF___INT_64)
 ENDIF()
 
 IF(SIZEOF_SSIZE_T)
-	SET(HAVE_SSIZE_T 1)
+  SET(HAVE_SSIZE_T 1)
 ELSE()
-	CHECK_TYPE_SIZE("SSIZE_T"	SIZEOF_SSIZE_T)
-	IF(SIZEOF_SSIZE_T)
-		SET(HAVE_SSIZE_T 1)
-	ENDIF()
+  CHECK_TYPE_SIZE("SSIZE_T" SIZEOF_SSIZE_T)
+  IF(SIZEOF_SSIZE_T)
+    SET(HAVE_SSIZE_T 1)
+  ENDIF()
 ENDIF()
 
-# Check for various functions. 
-CHECK_FUNCTION_EXISTS(fsync	HAVE_FSYNC)
-CHECK_FUNCTION_EXISTS(strlcat 	HAVE_STRLCAT)
-CHECK_FUNCTION_EXISTS(strerror	HAVE_STRERROR)
-CHECK_FUNCTION_EXISTS(snprintf	HAVE_SNPRINTF)
-CHECK_FUNCTION_EXISTS(strchr	HAVE_STRCHR)
-CHECK_FUNCTION_EXISTS(strrchr	HAVE_STRRCHR)
-CHECK_FUNCTION_EXISTS(strcat	HAVE_STRCAT)
-CHECK_FUNCTION_EXISTS(strcpy	HAVE_STRCPY)
-CHECK_FUNCTION_EXISTS(strdup	HAVE_STRDUP)
-CHECK_FUNCTION_EXISTS(strcasecmp	HAVE_STRCASECMP)
-CHECK_FUNCTION_EXISTS(strtod	HAVE_STRTOD)
-CHECK_FUNCTION_EXISTS(strtoll	HAVE_STRTOLL)
-CHECK_FUNCTION_EXISTS(strtoull	HAVE_STROULL)
-CHECK_FUNCTION_EXISTS(strstr	HAVE_STRSTR)
-CHECK_FUNCTION_EXISTS(mkstemp	HAVE_MKSTEMP)
-CHECK_FUNCTION_EXISTS(rand	HAVE_RAND)
-CHECK_FUNCTION_EXISTS(gettimeofday	HAVE_GETTIMEOFDAY)
-CHECK_FUNCTION_EXISTS(fsync	HAVE_FSYNC)
-CHECK_FUNCTION_EXISTS(MPI_Comm_f2C	HAVE_MPI_COMM_F2C)
-CHECK_FUNCTION_EXISTS(memmove	HAVE_MEMMOVE)
-CHECK_FUNCTION_EXISTS(getpagesize	HAVE_GETPAGESIZE)
-CHECK_FUNCTION_EXISTS(sysconf	HAVE_SYSCONF)
-CHECK_FUNCTION_EXISTS(mremap	HAVE_MREMAP)
-CHECK_FUNCTION_EXISTS(getrlimit	HAVE_GETRLIMIT)
+# Check for various functions.
+CHECK_FUNCTION_EXISTS(fsync HAVE_FSYNC)
+CHECK_FUNCTION_EXISTS(strlcat   HAVE_STRLCAT)
+CHECK_FUNCTION_EXISTS(strerror  HAVE_STRERROR)
+CHECK_FUNCTION_EXISTS(snprintf  HAVE_SNPRINTF)
+CHECK_FUNCTION_EXISTS(strchr  HAVE_STRCHR)
+CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
+CHECK_FUNCTION_EXISTS(strcat  HAVE_STRCAT)
+CHECK_FUNCTION_EXISTS(strcpy  HAVE_STRCPY)
+CHECK_FUNCTION_EXISTS(strdup  HAVE_STRDUP)
+CHECK_FUNCTION_EXISTS(strcasecmp  HAVE_STRCASECMP)
+CHECK_FUNCTION_EXISTS(strtod  HAVE_STRTOD)
+CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
+CHECK_FUNCTION_EXISTS(strtoull  HAVE_STROULL)
+CHECK_FUNCTION_EXISTS(strstr  HAVE_STRSTR)
+CHECK_FUNCTION_EXISTS(mkstemp HAVE_MKSTEMP)
+CHECK_FUNCTION_EXISTS(rand  HAVE_RAND)
+CHECK_FUNCTION_EXISTS(gettimeofday  HAVE_GETTIMEOFDAY)
+CHECK_FUNCTION_EXISTS(fsync HAVE_FSYNC)
+CHECK_FUNCTION_EXISTS(MPI_Comm_f2C  HAVE_MPI_COMM_F2C)
+CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
+CHECK_FUNCTION_EXISTS(getpagesize HAVE_GETPAGESIZE)
+CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
+CHECK_FUNCTION_EXISTS(mremap  HAVE_MREMAP)
+CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
 CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
 
 #####
@@ -950,7 +948,7 @@ CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
 
 # Create config.h file, nc-config
 configure_file("${netCDF_SOURCE_DIR}/config.h.in.cmake"
-	"${netCDF_BINARY_DIR}/config.h")
+  "${netCDF_BINARY_DIR}/config.h")
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 INSTALL(PROGRAMS ${netCDF_BINARY_DIR}/nc-config DESTINATION bin COMPONENT utilities)
 INCLUDE_DIRECTORIES(${netCDF_BINARY_DIR})
@@ -961,7 +959,7 @@ INCLUDE_DIRECTORIES(${netCDF_BINARY_DIR})
 #####
 # Set core names of the libraries.
 #####
-SET (netCDF_LIB_CORENAME	"netcdf")
+SET (netCDF_LIB_CORENAME  "netcdf")
 
 #####
 # Set the true names of all the libraries, if customized by external project
@@ -980,8 +978,8 @@ add_subdirectory(libsrc4)
 ENDIF (USE_HDF5)
 
 IF (USE_DAP)
-	ADD_SUBDIRECTORY(oc2)
-	ADD_SUBDIRECTORY(libdap2)
+  ADD_SUBDIRECTORY(oc2)
+  ADD_SUBDIRECTORY(libdap2)
 ENDIF()
 
 add_subdirectory(liblib)
@@ -989,41 +987,41 @@ add_subdirectory(liblib)
 # For tests and utilities, we are no longer
 # exporting symbols but rather importing them.
 IF(BUILD_DLL)
-	REMOVE_DEFINITIONS(-DDLL_EXPORT)
+  REMOVE_DEFINITIONS(-DDLL_EXPORT)
 ENDIF()
 
 # Enable Utilities.
 IF (BUILD_UTILITIES)
-	INCLUDE_DIRECTORIES(ncdump)
-	ADD_SUBDIRECTORY(ncgen)
-	ADD_SUBDIRECTORY(ncgen3)
-	ADD_SUBDIRECTORY(ncdump)
+  INCLUDE_DIRECTORIES(ncdump)
+  ADD_SUBDIRECTORY(ncgen)
+  ADD_SUBDIRECTORY(ncgen3)
+  ADD_SUBDIRECTORY(ncdump)
 ENDIF()
 
 # Enable tests
 IF(ENABLE_TESTS)
-	ADD_SUBDIRECTORY(nctest)
-	ADD_SUBDIRECTORY(nc_test)
-	IF(USE_NETCDF4)
-  		ADD_SUBDIRECTORY(nc_test4)
-		ADD_SUBDIRECTORY(h5_test)
-	ENDIF()
-	IF(USE_DAP AND ENABLE_DAP_REMOTE_TESTS)
-		ADD_SUBDIRECTORY(ncdap_test)
-	ENDIF()
-	
-	IF(ENABLE_EXAMPLES)
-		ADD_SUBDIRECTORY(examples)
-	ENDIF()
+  ADD_SUBDIRECTORY(nctest)
+  ADD_SUBDIRECTORY(nc_test)
+  IF(USE_NETCDF4)
+      ADD_SUBDIRECTORY(nc_test4)
+    ADD_SUBDIRECTORY(h5_test)
+  ENDIF()
+  IF(USE_DAP AND ENABLE_DAP_REMOTE_TESTS)
+    ADD_SUBDIRECTORY(ncdap_test)
+  ENDIF()
+
+  IF(ENABLE_EXAMPLES)
+    ADD_SUBDIRECTORY(examples)
+  ENDIF()
 
 ENDIF()
 
 # Code to generate an export header
 #GENERATE_EXPORT_HEADER(netcdf
-#	BASE_NAME netcdf
-#	EXPORT_MACRO_NAME netcdf_EXPORT
-#	EXPORT_FILE_NAME netcdf_Export.h
-#	STATIC_DEFINE netcdf_BUILT_AS_STATIC
+# BASE_NAME netcdf
+# EXPORT_MACRO_NAME netcdf_EXPORT
+# EXPORT_FILE_NAME netcdf_Export.h
+# STATIC_DEFINE netcdf_BUILT_AS_STATIC
 #)
 
 #####
@@ -1034,19 +1032,19 @@ ADD_SUBDIRECTORY(man4)
 # Moving on to CPack, install packages.
 #####
 INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf.h
-  	DESTINATION include COMPONENT headers)
+    DESTINATION include COMPONENT headers)
 IF(ENABLE_PNETCDF OR ENABLE_PARALLEL)
-	INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_par.h
-	DESTINATION include COMPONENT headers)
+  INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_par.h
+  DESTINATION include COMPONENT headers)
 ENDIF()
 # Install the dependencies.
 IF(MSVC)
-	INSTALL(DIRECTORY ${CMAKE_PREFIX_PATH} DESTINATION "deps" COMPONENT dependencies)
+  INSTALL(DIRECTORY ${CMAKE_PREFIX_PATH} DESTINATION "deps" COMPONENT dependencies)
 ENDIF()
 
 
-IF(ENABLE_DOXYGEN)	
-	INSTALL(DIRECTORY man4 DESTINATION "." COMPONENT documentation)
+IF(ENABLE_DOXYGEN)
+  INSTALL(DIRECTORY man4 DESTINATION "." COMPONENT documentation)
 ENDIF()
 
 # Subdirectory CMakeLists.txt files should specify their own
@@ -1064,20 +1062,20 @@ CONFIGURE_FILE(
 # cmake should be able to find netcdf using find_package and find_library.
 # This call is paired with one in liblib.
 install (EXPORT netcdf-targets
-	DESTINATION share/cmake
-	COMPONENT documentation)
+  DESTINATION share/cmake
+  COMPONENT documentation)
 
 configure_file (
-	${netCDF_SOURCE_DIR}/netcdf-config.cmake.in
-	${netCDF_BINARY_DIR}/netcdf-config.cmake @ONLY)
+  ${netCDF_SOURCE_DIR}/netcdf-config.cmake.in
+  ${netCDF_BINARY_DIR}/netcdf-config.cmake @ONLY)
 
 configure_file (
-	${netCDF_SOURCE_DIR}/netcdf-config-version.cmake.in
-	${netCDF_BINARY_DIR}/netcdf-config-version.cmake @ONLY)
+  ${netCDF_SOURCE_DIR}/netcdf-config-version.cmake.in
+  ${netCDF_BINARY_DIR}/netcdf-config-version.cmake @ONLY)
 
 install (FILES ${netCDF_BINARY_DIR}/netcdf-config.cmake
-		${netCDF_BINARY_DIR}/netcdf-config-version.cmake
-		DESTINATION share/cmake)
+    ${netCDF_BINARY_DIR}/netcdf-config-version.cmake
+    DESTINATION share/cmake)
 
 
 ###
@@ -1088,7 +1086,7 @@ IF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
   SET(CMAKE_INSTALL_LIBDIR lib)
 ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 
-# Set 
+# Set
 SET(prefix ${CMAKE_INSTALL_PREFIX})
 SET(exec_prefix ${CMAKE_INSTALL_PREFIX})
 SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
@@ -1121,7 +1119,7 @@ configure_file (
   ${netCDF_SOURCE_DIR}/netcdf.pc.in
   ${netCDF_BINARY_DIR}/netcdf.pc @ONLY)
 
-install (FILES ${netCDF_BINARY_DIR}/netcdf.pc 
+install (FILES ${netCDF_BINARY_DIR}/netcdf.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
 
 ###
@@ -1136,39 +1134,39 @@ install (FILES ${netCDF_BINARY_DIR}/netcdf.pc
 
 ##
 # Declare exclusions list used when building a source file.
-# NOTE!! This list uses regular expressions, NOT wildcards!! 
-## 
+# NOTE!! This list uses regular expressions, NOT wildcards!!
+##
 SET (CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}"
-	"/expecttds3/"
-	"/nocacheremote3/"
-	"/nocacheremote4/"
-	"/special3/"
-	"${CMAKE_BINARY_DIR}/*"
-	"/myhtml/*"
-	"/.svn/"
-	"my.*\\\\.sh"
-	"/.deps/"
-	"/.libs"
-	"/html/"
-	".*\\\\.jar"
-	".*\\\\.jdl"
-	".*\\\\.sed"
-	".*\\\\.proto"
-	".*\\\\.texi"
-	".*\\\\.example"
-	"Make0"
-	"/obsolete/"
-	"/unknown/"
-	".*~" 
+  "/expecttds3/"
+  "/nocacheremote3/"
+  "/nocacheremote4/"
+  "/special3/"
+  "${CMAKE_BINARY_DIR}/*"
+  "/myhtml/*"
+  "/.svn/"
+  "my.*\\\\.sh"
+  "/.deps/"
+  "/.libs"
+  "/html/"
+  ".*\\\\.jar"
+  ".*\\\\.jdl"
+  ".*\\\\.sed"
+  ".*\\\\.proto"
+  ".*\\\\.texi"
+  ".*\\\\.example"
+  "Make0"
+  "/obsolete/"
+  "/unknown/"
+  ".*~"
 )
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT
-	${CMAKE_CURRENT_BINARY_DIR}/COPYRIGHT.txt
-	@ONLY
+  ${CMAKE_CURRENT_BINARY_DIR}/COPYRIGHT.txt
+  @ONLY
 )
 
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/COPYRIGHT.txt")
 IF(NOT CPACK_PACK_VERSION)
-	SET(CPACK_PACKAGE_VERSION ${VERSION})
+  SET(CPACK_PACKAGE_VERSION ${VERSION})
 ENDIF()
 
 
@@ -1179,13 +1177,13 @@ ENDIF()
 
 # Create an 'uninstall' target.
 CONFIGURE_FILE(
-	"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-	"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-	IMMEDIATE @ONLY)
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
 
 
 ADD_CUSTOM_TARGET(uninstall
-	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
 
 ## Customize some of the package component descriptions
@@ -1197,15 +1195,15 @@ set (CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "netCDF Documentation")
 
 
 set (CPACK_COMPONENT_UTILITIES_DESCRIPTION
-	"The netCDF Utilities")
+  "The netCDF Utilities")
 set (CPACK_COMPONENT_LIBRARIES_DESCRIPTION
-	"The netCDF Libraries")
+  "The netCDF Libraries")
 set (CPACK_COMPONENT_HEADERS_DESCRIPTION
-	"C header files for use with netCDF")
+  "C header files for use with netCDF")
 set (CPACK_COMPONENT_DEPENDENCIES_DESCRIPTION
-	"Dependencies for this build of netCDF")
+  "Dependencies for this build of netCDF")
 set (CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
-	"The netCDF user documentation.")
+  "The netCDF user documentation.")
 print_conf_summary()
 
 
diff --git a/cf b/cf
index f36128ef3..440032a0f 100644
--- a/cf
+++ b/cf
@@ -16,6 +16,8 @@ DAP=1
 #M32=1
 #M64=1
 
+FORCE="-i"
+
 #INSTALL=1
 PREFIX=/usr/local
 
@@ -153,6 +155,7 @@ FLAGS="$FLAGS --disable-examples"
 #FLAGS="$FLAGS --enable-large-file-tests"
 #FLAGS="$FLAGS --disable-testsets"
 #FLAGS="$FLAGS --disable-dap-remote-tests"
+#FLAGS="$FLAGS --enable-dap-auth-tests"
 #FLAGS="$FLAGS --enable-doxygen"
 #FLAGS="$FLAGS --enable-logging"
 #FLAGS="$FLAGS --disable-diskless"
@@ -215,6 +218,6 @@ export DISTCHECK_CONFIGURE_FLAGS
 if test -f Makefile ; then ${MAKE} distclean >/dev/null 2>&1 ; fi
 sh $X ./configure ${FLAGS}
 for c in $cmds; do
-  ${MAKE} $c
+  ${MAKE} ${FORCE} $c
 done
 exit 0
diff --git a/configure.ac b/configure.ac
index d2321c37b..261ace42a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,22 @@ if test "x$enable_dap" = "xno" ; then
 fi
 AC_MSG_RESULT($enable_dap_remote_tests)
 
+# Default is now to do the remote authorization tests
+AC_MSG_CHECKING([whether dap remote authorization testing should be enabled (default off)])
+AC_ARG_ENABLE([dap-auth-test],
+              [AS_HELP_STRING([--enable-dap-auth-tests],
+                                 [enable dap remote authorization tests])])
+test "x$enable_dap_auth_tests" = xyes || enable_dap_auth_tests=no
+# dap must be enabled
+if test "x$enable_dap" = "xno" ; then
+  enable_dap_auth_tests=no
+fi
+# if remote tests are disabled, then so is this
+if test "x$enable_dap_remote_tests" = "xno" ; then
+  enable_dap_remote_tests=no
+fi
+AC_MSG_RESULT($enable_dap_auth_tests)
+
 # Control if groups are supported in [netcdf4]dap2 code
 AC_MSG_CHECKING([whether [netcdf4] group names should be enabled (default on)])
 AC_ARG_ENABLE([dap-groups],
@@ -811,6 +827,7 @@ AM_CONDITIONAL(TEST_PARALLEL, [test "x$enable_parallel" = xyes -a "x$enable_para
 AM_CONDITIONAL(BUILD_DAP, [test "x$enable_dap" = xyes])
 AM_CONDITIONAL(USE_DAP, [test "x$enable_dap" = xyes]) # Alias
 AM_CONDITIONAL(ENABLE_DAP_REMOTE_TESTS, [test "x$enable_dap_remote_tests" = xyes])
+AM_CONDITIONAL(ENABLE_DAP_AUTH_TESTS, [test "x$enable_dap_auth_tests" = xyes])
 AM_CONDITIONAL(ENABLE_DAP_LONG_TESTS, [test "x$enable_dap_long_tests" = xyes])
 AM_CONDITIONAL(EXTRA_EXAMPLE_TESTS, [test "x$enable_extra_example_tests" = xyes])
 AM_CONDITIONAL(USE_SZIP, [test "x$ac_cv_func_H5Z_SZIP" = xyes])
diff --git a/include/nc.h b/include/nc.h
index 6653ebad6..8c44edc74 100644
--- a/include/nc.h
+++ b/include/nc.h
@@ -27,7 +27,8 @@ typedef struct NC {
 	void* dispatchdata; /*per-'file' data; points to e.g. NC3_INFO data*/
 	char* path;
 	int   mode; /* as provided to nc_open/nc_create */
-	int substrate;
+	int   substrate;
+	int   refcount; /* To enable multiple name-based opens */
 } NC;
 
 /*
@@ -76,6 +77,7 @@ extern int nc_get_default_format(void);
 extern int add_to_NCList(NC*);
 extern void del_from_NCList(NC*);/* does not free object */
 extern NC* find_in_NCList(int ext_ncid);
+extern NC* find_in_NCList_by_name(const char*);
 extern void free_NCList(void);/* reclaim whole list */
 extern int count_NCList(void); /* return # of entries in NClist */
 
diff --git a/libdispatch/ddispatch.c b/libdispatch/ddispatch.c
index c2e36dbf8..24a80d573 100644
--- a/libdispatch/ddispatch.c
+++ b/libdispatch/ddispatch.c
@@ -31,15 +31,10 @@ static struct NCPROTOCOLLIST {
    against future changes.
 */
 static const char* servers[] = {
-"http://thredds-test.ucar.edu",
-"http://thredds.ucar.edu",
-"http://motherlode.ucar.edu:8081",
-"http://motherlode.ucar.edu:8080",
-"http://motherlode.ucar.edu",
 "http://remotetest.unidata.ucar.edu",
+"http://thredds-test.unidata.ucar.edu",
 "http://remotetest.ucar.edu",
-"http://remotetests.unidata.ucar.edu",
-"http://remotetests.ucar.edu",
+"http://thredds-test.ucar.edu",
 NULL
 };
 
diff --git a/libdispatch/dfile.c b/libdispatch/dfile.c
index e3f17709f..08ed93f50 100644
--- a/libdispatch/dfile.c
+++ b/libdispatch/dfile.c
@@ -1033,6 +1033,11 @@ nc_abort(int ncid)
    NC* ncp;
    int stat = NC_check_id(ncid, &ncp);
    if(stat != NC_NOERR) return stat;
+
+   /* What to do if refcount > 0? */
+   /* currently, forcibly abort */
+   ncp->refcount = 0;
+
    stat = ncp->dispatch->abort(ncid);
    del_from_NCList(ncp);
    free_NC(ncp);
@@ -1085,10 +1090,15 @@ nc_close(int ncid)
    NC* ncp;
    int stat = NC_check_id(ncid, &ncp);
    if(stat != NC_NOERR) return stat;
-   stat = ncp->dispatch->close(ncid);
-   /* Remove from the nc list */
-   del_from_NCList(ncp);
-   free_NC(ncp);
+
+   ncp->refcount--;
+   if(ncp->refcount <= 0)
+   {
+       stat = ncp->dispatch->close(ncid);
+       /* Remove from the nc list */
+       del_from_NCList(ncp);
+       free_NC(ncp);
+   }
    return stat;
 }
 
@@ -1505,6 +1515,11 @@ NC_create(const char *path, int cmode, size_t initialsz,
       nc_initialized = 1;
    }
 
+   /* If this path is already open, then fail */
+   ncp = find_in_NCList_by_name(path);
+   if(ncp != NULL)
+	return NC_ENFILE;   
+
    if((isurl = NC_testurl(path)))
 	model = NC_urlmodel(path);
 
@@ -1636,6 +1651,14 @@ NC_open(const char *path, int cmode,
       nc_initialized = 1;
    }
 
+   /* If this path is already open, then bump the refcount and return it */
+   ncp = find_in_NCList_by_name(path);
+   if(ncp != NULL) {
+	ncp->refcount++;
+	if(ncidp) *ncidp = ncp->ext_ncid;	
+	return NC_NOERR;
+   }
+
    isurl = NC_testurl(path);
    if(isurl)
       model = NC_urlmodel(path);
diff --git a/libdispatch/nclistmgr.c b/libdispatch/nclistmgr.c
index ad521ac7b..afc7b447b 100644
--- a/libdispatch/nclistmgr.c
+++ b/libdispatch/nclistmgr.c
@@ -42,6 +42,10 @@ add_to_NCList(NC* ncp)
 	    return NC_ENOMEM;
 	numfiles = 0;
     }
+    /* Check the refcount */
+    if(ncp->refcount > 0)
+	return NC_NOERR;
+
     new_id = 0; /* id's begin at 1 */
     for(i=1; i < NCFILELISTLENGTH; i++) {
 	if(nc_filelist[i] == NULL) {new_id = i; break;}
@@ -60,6 +64,10 @@ del_from_NCList(NC* ncp)
    unsigned int ncid = ((unsigned int)ncp->ext_ncid) >> ID_SHIFT;
    if(numfiles == 0 || ncid == 0 || nc_filelist == NULL) return;
    if(nc_filelist[ncid] != ncp) return;
+   /* Check the refcount */
+   if(ncp->refcount > 0)
+	return; /* assume caller has decrecmented */
+
    nc_filelist[ncid] = NULL;
    numfiles--;
 
@@ -78,3 +86,25 @@ find_in_NCList(int ext_ncid)
    return f;
 }
 
+/*
+Added to support open by name
+*/
+NC*
+find_in_NCList_by_name(const char* path)
+{
+   int i;
+   NC* f = NULL;
+   if(nc_filelist == NULL)
+	return NULL;
+   for(i=1; i < NCFILELISTLENGTH; i++) {
+	if(nc_filelist[i] != NULL) {
+	    if(strcmp(nc_filelist[i]->path,path)==0) {
+		f = nc_filelist[i];
+		break;
+	    }				
+	}
+   }
+   return f;
+}
+
+
diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt
index 85905c4c9..c58290d28 100644
--- a/ncdap_test/CMakeLists.txt
+++ b/ncdap_test/CMakeLists.txt
@@ -40,10 +40,16 @@ IF(ENABLE_TESTS)
 	ENDIF()
 	add_bin_test(ncdap test_nstride_cached)
 	add_bin_test(ncdap test_partvar)
-	add_bin_test(ncdap test_varm3)
 	add_bin_test(ncdap t_auth)
 	add_bin_test(ncdap t_misc)
 	
+# test_varm3 did not survive the transition
+# to remotetest.unidata.ucar.edu; the
+# coads_climatology.nc file cannot be found.
+# Can restore if/when we find that file
+# and put it in testdods directory on remotetest.
+#	add_bin_test(ncdap test_varm3)
+
 ENDIF()
 ADD_SUBDIRECTORY(testdata3)
 ADD_SUBDIRECTORY(expected3)
diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am
index ef07d4d8b..e5dce4f70 100644
--- a/ncdap_test/Makefile.am
+++ b/ncdap_test/Makefile.am
@@ -34,26 +34,35 @@ endif
 test_cvt3_SOURCES = test_cvt.c
 test_vara_SOURCES = test_vara.c
 test_partvar_SOURCES = test_partvar.c
-test_varm3_SOURCES = test_varm3.c
 t_dap3a_SOURCES = t_dap3a.c
 test_nstride_cached_SOURCE = test_nstride_cached.c
 t_auth_SOURCES = t_auth.c
 t_misc_SOURCES = t_misc.c
 
 TESTS += t_dap3a test_cvt3 test_vara test_partvar
-TESTS += test_varm3
 TESTS += t_dap3a
 TESTS += test_nstride_cached
-TESTS += t_auth
 TESTS += t_misc
 
 check_PROGRAMS += t_dap3a test_cvt3 test_vara test_partvar
-check_PROGRAMS += test_varm3
 check_PROGRAMS += t_dap3a
 check_PROGRAMS += test_nstride_cached
-check_PROGRAMS += t_auth
 check_PROGRAMS += t_misc
 
+# test_varm3 did not survive the transition
+# to remotetest.unidata.ucar.edu; the
+# coads_climatology.nc file cannot be found.
+# Can restore if/when we find that file
+# and put it in testdods directory on remotetest.
+# test_varm3_SOURCES = test_varm3.c
+# check_PROGRAMS += test_varm3
+# TESTS += test_varm3
+
+if ENABLE_DAP_AUTH_TESTS
+check_PROGRAMS += t_auth
+TESTS += t_auth
+endif
+
 endif #ENABLE_DAP_REMOTE_TESTS
 
 
diff --git a/ncdap_test/t_misc.c b/ncdap_test/t_misc.c
index 2c2ad2500..579d516fc 100644
--- a/ncdap_test/t_misc.c
+++ b/ncdap_test/t_misc.c
@@ -5,7 +5,7 @@
 #include <netcdf.h>
 
 
-#define URL1 "http://thredds-test.ucar.edu" /* test that no trailing / is ok */
+#define URL1 "http://remotetest.unidata.ucar.edu" /* test that no trailing / is ok */
 
 static void
 CHECK(int e, const char* msg)
diff --git a/ncdump/env b/ncdump/env
new file mode 100644
index 000000000..a998e21b8
--- /dev/null
+++ b/ncdump/env
@@ -0,0 +1,6 @@
+F="tst_small.nc"
+
+alias q0="./ncdump $F"
+alias qh="./ncdump -h $F"
+alias qq="gdb --args ./ncdump $F"
+alias qqh="gdb --args ./ncdump -h $F"