Resolve license issue with the utf8proc code.

CMakeLists.txt

@@ -487,6 +487,7 @@ IF(WIN32)
     SET(BUILD_DLL ON CACHE BOOL "")
     ADD_DEFINITIONS(-DDLL_NETCDF)
     ADD_DEFINITIONS(-DDLL_EXPORT)
+    ADD_DEFINITIONS(-DUTF8PROC_DLLEXPORT)
   ENDIF()
 ENDIF()
 # Did the user specify a default minimum blocksize for posixio?

RELEASE_NOTES.md

@@ -11,6 +11,8 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.4.2 - TBD
 
+* [Upgrade] Update utf8proc.[ch] to use the version now maintained by the
+Julia Language project (https://github.com/JuliaLang/utf8proc/blob/master/LICENSE.md).
 * [Bug] Addressed conversion problem with Windows sscanf.  This primarily affected some OPeNDAP URLs on Windows.  See [GitHub #365](https://github.com/Unidata/netcdf-c/issues/365) and [GitHub #366](https://github.com/Unidata/netcdf-c/issues/366) for more information.
 * [Enhancement] Added support for HDF5 collective metadata operations when available. Patch submitted by Greg Sjaardema, see [Pull request #335](https://github.com/Unidata/netcdf-c/pull/335) for more information.
 * [Bug] Addressed a potential type punning issue. See [GitHub #351](https://github.com/Unidata/netcdf-c/issues/351) for more information.

cf

@@ -117,7 +117,7 @@ FLAGS="$FLAGS --disable-examples"
 #FLAGS="$FLAGS --disable-dap-remote-tests"
 FLAGS="$FLAGS --enable-dap-auth-tests"
 #FLAGS="$FLAGS --enable-doxygen"
-#FLAGS="$FLAGS --enable-logging"
+FLAGS="$FLAGS --enable-logging"
 #FLAGS="$FLAGS --disable-diskless"
 #FLAGS="$FLAGS --enable-mmap"
 #FLAGS="$FLAGS --with-udunits"

include/Makefile.am

@@ -15,7 +15,7 @@ include_HEADERS += netcdf_mem.h
 endif
 
 noinst_HEADERS = nc_logging.h nc_tests.h fbits.h nc.h	\
-nclist.h ncuri.h utf8proc.h ncdispatch.h ncdimscale.h		\
+nclist.h ncuri.h ncutf8.h ncdispatch.h ncdimscale.h		\
 netcdf_f.h err_macros.h ncbytes.h nchashmap.h ceconstraints.h rnd.h	\
 nclog.h ncconfigure.h nc4internal.h nctime.h nc3dispatch.h nc3internal.h \
 onstack.h nc_hashmap.h

include/ncutf8.h

@@ -0,0 +1,34 @@
+/*
+ *	Copyright 2017, University Corporation for Atmospheric Research
+ *      See netcdf/COPYRIGHT file for copying and redistribution conditions.
+ */
+
+#ifndef NCUTF8_H
+#define NCUTF8_H 1
+
+/* Provide a wrapper around whatever utf8 library we use. */
+
+/*
+ * Check validity of a UTF8 encoded null-terminated byte string.
+ * Return codes:
+ * NC_NOERR -- string is valid utf8
+ * NC_ENOMEM -- out of memory
+ * NC_EBADNAME-- not valid utf8
+ */
+extern int nc_utf8_validate(const unsigned char * name);
+
+/*
+ * Apply NFC normalization to a string.
+ * Returns a pointer to newly allocated memory of an NFC
+ * normalized version of the null-terminated string 'str'.
+ * Pointer to normalized string is returned in normalp argument;
+ * caller must free.
+ * Return codes:
+ * NC_NOERR -- success
+ * NC_ENOMEM -- out of memory
+ * NC_EBADNAME -- other failure
+ */
+extern int nc_utf8_normalize(const unsigned char* str, unsigned char** normalp);
+
+#endif /*NCUTF8_H*/
+