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/Makefile.am

@@ -219,7 +219,6 @@ libcdi_f2003_la_LIBADD = libcdi.la
 
 libcdipio_la_SOURCES = \
   cdipio.h \
-  cfortran.h \
   pio.c \
   pio.h \
   pio_cdf_int.h \
@@ -261,16 +260,16 @@ libcdipio_la_SOURCES = \
   resource_unpack.c \
   resource_unpack.h
 
-if HAVE_PARALLEL_NC4
-libcdipio_la_SOURCES += pio_cdf_int.c
-endif
-
 if USE_FC
 libcdipio_la_SOURCES += \
   cdipioFortran.c \
   cfortran.h
 endif
 
+if HAVE_PARALLEL_NC4
+libcdipio_la_SOURCES += pio_cdf_int.c
+endif
+
 libcdipio_la_LIBADD = libcdi.la $(LIBRT) $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(MPI_C_LIB)
 
 if MAINTAINER_MODE