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

cdi.settings.in

@@ -13,7 +13,6 @@
       "LD"       : "@LD@",
       "NM"       : "@NM@",
       "AR"       : "@AR@",
-      "AS"       : "@AS@",
       "DLLTOOL"  : "@DLLTOOL@",
       "OBJDUMP"  : "@OBJDUMP@",
       "STRIP"    : "@STRIP@",
@@ -29,7 +28,7 @@
         "libs"     : "@MPI_C_LIB@",
         "cflags"   : "@MPI_C_INCLUDE@",
         "fclibs"   : "@MPI_FC_LIB@",
-        "fcflags"  : "@MPI_FC_INCLUDE@"
+        "fcflags"  : "@MPI_FC_MOD@"
       },
       "fdb5"    : {
         "lib"      : "@FDB5_LIBS@",
@@ -57,16 +56,14 @@
     }
   },
   "features" : {
-    "enable_cdi_lib" : @ENABLE_CDI_LIB@,
+    "enable_cdi_lib" : "@ENABLE_CDI_LIB@",
     "grib"           : "@ENABLE_GRIB@",
     "cgribex"        : "@ENABLE_CGRIBEX@",
     "service"        : "@ENABLE_SERVICE@",
     "extra"          : "@ENABLE_EXTRA@",
     "ieg"            : "@ENABLE_IEG@",
-    "enable_mpi"     : @ENABLE_MPI@,
-    "parallel_nc4"   : @HAVE_PARALLEL_NC4@,
-    "enable_python"  : @ENABLE_PYTHON@,
-    "enable_ruby"    : @ENABLE_RUBY@
+    "enable_mpi"     : "@ENABLE_MPI@",
+    "parallel_nc4"   : "@HAVE_PARALLEL_NC4@"
     "across"         : "@ENABLE_ACROSS@",
   }
 }