Consolidation with CDI-PIO (develop)

Generally, this is !11 (merged) rebased onto the develop branch.

This is the first develop-based version accepted by the Buildbot of ICON: https://buildbot.dkrz.de/grid?branch=m300488/cdi-pio-2-integration

src/cdf.c

@@ -9,14 +9,11 @@
 #include "cdi_int.h"
 #include "cdf_int.h"
 
+#ifdef HAVE_LIBNETCDF
 const char *
 cdfLibraryVersion(void)
 {
-#ifdef HAVE_LIBNETCDF
   return nc_inq_libvers();
-#else
-  return "library undefined";
-#endif
 }
 
 #ifdef HAVE_H5GET_LIBVERSION
@@ -64,7 +61,6 @@ cdfDebug(int debug)
   if (CDF_Debug) Message("debug level %d", debug);
 }
 
-#ifdef HAVE_LIBNETCDF
 static void
 cdfComment(int ncid)
 {
@@ -85,7 +81,6 @@ cdfComment(int ncid)
 
   cdf_put_att_text(ncid, NC_GLOBAL, "CDI", strlen(comment), comment);
 }
-#endif
 
 static bool
 has_uri_scheme(const char *uri)
@@ -104,7 +99,6 @@ static int
 cdfOpenFile(const char *filename, const char *mode, int *filetype)
 {
   int ncid = -1;
-#ifdef HAVE_LIBNETCDF
   const int fmode = tolower(*mode);
   int writemode = NC_CLOBBER;
   int readmode = NC_NOWRITE;
@@ -167,7 +161,6 @@ cdfOpenFile(const char *filename, const char *mode, int *filetype)
         default: ncid = CDI_EINVAL;
         }
     }
-#endif
 
   return ncid;
 }
@@ -180,13 +173,11 @@ cdfOpen(const char *filename, const char *mode, int filetype)
 
   if (CDF_Debug) Message("Open %s with mode %c", filename, *mode);
 
-#ifdef HAVE_LIBNETCDF
 #ifndef NC_64BIT_OFFSET
   if (filetype == CDI_FILETYPE_NC2) open_file = false;
 #endif
 #ifndef NC_64BIT_DATA
   if (filetype == CDI_FILETYPE_NC5) open_file = false;
-#endif
 #endif
 
   if (open_file)
@@ -260,9 +251,7 @@ cdf4Open(const char *filename, const char *mode, int *filetype)
 static void
 cdfCloseFile(int fileID)
 {
-#ifdef HAVE_LIBNETCDF
   cdf_close(fileID);
-#endif
 }
 
 void
@@ -270,6 +259,7 @@ cdfClose(int fileID)
 {
   cdfCloseFile(fileID);
 }
+#endif
 /*
  * Local Variables:
  * c-file-style: "Java"