Fix merge conflict.

ChangeLog

-2021-10-21 Uwe Schulzweida
+2021-10-21  Uwe Schulzweida
 
 	* cdf_read_coordinates: check yvarid (bug fix)
 
-2021-10-11 Uwe Schulzweida
+2021-10-11  Uwe Schulzweida
 
         * using CGRIBEX library version 2.0.0
 	* Version 2.0.0 released

config/default

@@ -64,6 +64,7 @@ case "${HOSTNAME}" in
 	;;
     hama*)
         CDILIBS="--disable-iso-c-interface \
+                 --enable-maintainer-mode \
                  --with-szlib=$HOME/local \
                  --with-fdb5=$HOME/src/fdb \
                  --with-eccodes=$HOME/local/eccodes-2.22.0 \