Merge branch 'develop' of git-test.mpimet.mpg.de:cdo into develop

.rake.json

@@ -20,7 +20,7 @@
       "hostname": "mpipc149.mpi.zmaw.de",
       "dir": "/scratch/local1/m300064/builds/remote",
       "envConfigFiles": ["/etc/profile",".profile"],
-      "CC": ["gcc"]
+      "CC": ["gcc","g++","clang","clang++"]
     },
     "mistral": {
       "hostname": "mistral.dkrz.de",
@@ -82,7 +82,7 @@
     "localGCC": {
       "doc": "local builder with default GCC - VPATH build",
       "hostname": "luthien",
-      "configureCall": "/home/ram/src/cdo/configure --enable-openmp CC=gcc CFLAGS='-g -O2'",
+      "configureCall": "/home/ram/src/cdo/configure --enable-openmp --with-grib_api --with-netcdf --with-hdf5 --with-proj --with-udunits2 CC=gcc CFLAGS='-g -O2'",
       "makeCall": "make -j 12",
       "sync": false
     },

config/default

@@ -304,16 +304,40 @@ case "${HOSTNAME}" in
     ;;
 # standard workstations at MPI-M debian jessie
     mpipc149)
-        ${CONFPATH}configure \
-               --prefix=`pwd`/build \
-               --enable-maintainer-mode \
-               --with-netcdf='/sw/jessie-x64/netcdf-4.3.3.1-gccsys' \
-               --with-hdf5='/sw/jessie-x64/hdf5-1.8.16-gccsys/' \
-               --with-szlib='/sw/jessie-x64/szip-2.1-gccsys' \
-               --with-udunits2='/sw/jessie-x64/udunits-2.2.20-gccsys' \
-               --enable-ruby --enable-swig --enable-python \
-	           CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2" LIBS='-lm  -lpthread '
+      CDOLIBS="--prefix=`pwd`/build \
+              --enable-maintainer-mode \
+              --with-netcdf=/sw/jessie-x64/netcdf-4.3.3.1-gccsys \
+              --with-hdf5=/sw/jessie-x64/hdf5-1.8.16-gccsys/ \
+              --with-szlib=/sw/jessie-x64/szip-2.1-gccsys \
+              --with-udunits2=/sw/jessie-x64/udunits-2.2.20-gccsys \
+              --enable-ruby --enable-swig --enable-python "
+      case "$COMP" in
+        gcc)
+          ${CONFPATH}configure \
+            $CDOLIBS \
+            CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2" LIBS='-lm  -lpthread '
+          ;;
+        g++) # jessie used gcc 6.1.1
+          ${CONFPATH}configure \
+            $CDOLIBS \
+            --enable-cxx \
+            CC=gcc CXX=g++ CFLAGS="-std=c99 -g -Wall -W -Wfloat-equal -pedantic -O2" LIBS='-lm  -lpthread '
+          ;;
+        clang)
+          ${CONFPATH}configure \
+            $CDOLIBS \
+            --disable-openmp \
+            CC=/sw/jessie-x64/util/clang+llvm-3.8.0/bin/clang CXX=/sw/jessie-x64/util/clang+llvm-3.8.0/bin/clang++
         ;;
+        clang++) # recent clang-3.8
+          ${CONFPATH}configure \
+            $CDOLIBS \
+            --disable-openmp \
+            --enable-cxx \
+            CC=/sw/jessie-x64/util/clang+llvm-3.8.0/bin/clang CXX=/sw/jessie-x64/util/clang+llvm-3.8.0/bin/clang++
+        ;;
+      esac
+      ;;
 # standard workstations at MPI-M x86_64-lenny
     mpipc* )
 	${CONFPATH}configure \