Add configure option --with-fdb5

cdi.settings.in

@@ -31,6 +31,10 @@
         "fclibs"   : "@MPI_FC_LIB@",
         "fcflags"  : "@MPI_FC_INCLUDE@"
       },
+      "fdb5"    : {
+        "lib"      : "@FDB5_LIBS@",
+        "include"  : "@FDB5_INCLUDE@"
+      },
       "szlib"    : {
         "lib"      : "@SZLIB_LIBS@",
         "include"  : "@SZLIB_INCLUDE@"

config/default

@@ -69,7 +69,8 @@ case "${HOSTNAME}" in
                     --with-szlib=$HOME/local \
                     --with-eccodes=$HOME/local/eccodes-2.22.0 \
                     --with-netcdf=$HOME/local/netcdf-c-4.8.0 \
-                    LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.22.0/lib" \
+                    --with-fdb5=$HOME/src/fdb \
+                    LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.22.0/lib -Wl,-rpath,$HOME/src/fdb/lib" \
 	            CC=clang CFLAGS="-g -pipe -D_REENTRANT -Wall -Wwrite-strings -W -Wfloat-equal -pedantic -O3"
 	;;
 # x86_64-squeeze-x64-linux

m4/acx_options.m4

@@ -27,6 +27,41 @@ AS_CASE([$with_threads],
 AC_SUBST([THREADS_INCLUDE])
 AC_SUBST([THREADS_LIBS])
 #  ----------------------------------------------------------------------
+#  Compile application with FDB5 library
+FDB5_INCLUDE=''
+FDB5_LIBS=''
+AC_ARG_WITH([fdb5],
+            [AS_HELP_STRING([--with-fdb5=<yes|no|directory> (default=no)],[location of fdb5 library (optional)])],
+            [AS_CASE(["$with_fdb5"],
+                     [no],[AC_MSG_CHECKING([for fdb5 library])
+                           AC_MSG_RESULT([suppressed])],
+                     [yes],[AC_CHECK_HEADERS([fdb5/api/fdb_c.h],,
+                                             [AC_MSG_ERROR([Could not find fdb5/api/fdb_c.h])],
+                                             [AC_INCLUDES_DEFAULT])
+                            AC_SEARCH_LIBS([fdb_initialise],
+                                           [fdb5],
+                                           [AC_DEFINE([HAVE_LIBFDB5],[1],[Define to 1 for FDB5 support])],
+                                           [AC_MSG_ERROR([Could not link to fdb5])])
+                            FDB5_LIBS=" -lfdb5"],
+                     [*],[FDB5_ROOT=$with_fdb5
+                          AS_IF([test -d "$FDB5_ROOT"],
+                                [LDFLAGS="-L$FDB5_ROOT/lib $LDFLAGS"
+                                 CPPFLAGS="-I$FDB5_ROOT/include $CPPFLAGS"
+                                 AC_CHECK_HEADERS([fdb5/api/fdb_c.h],,
+                                                  [AC_MSG_ERROR([Could not find fdb5/api/fdb_c.h])],
+                                                  [AC_INCLUDES_DEFAULT])
+                                 AC_SEARCH_LIBS([fdb_initialise],
+                                                [fdb5],
+                                                [AC_DEFINE([HAVE_LIBFDB5],[1],[Define to 1 for FDB5 support])],
+                                                [AC_MSG_ERROR([Could not link to fdb5])])
+                                 FDB5_LIBS=" -L$FDB5_ROOT/lib -lfdb5"
+                                 FDB5_INCLUDE=" -I$FDB5_ROOT/include"],
+                                [AC_MSG_NOTICE([$FDB5_ROOT is not a directory! FDB5 suppressed])])])],
+            [AC_MSG_CHECKING([for fdb5 library])
+             AC_MSG_RESULT([suppressed])])
+AC_SUBST([FDB5_INCLUDE])
+AC_SUBST([FDB5_LIBS])
+#  ----------------------------------------------------------------------
 #  Compile application with SZLIB library, needed for GRIB1
 SZLIB_INCLUDE=''
 SZLIB_LIBS=''

src/cdi_int.c

@@ -122,6 +122,10 @@ void cdiPrintDefaults(void)
           CDI_Default_ModelID, CDI_Default_TableID, CDI_Default_Missval);
 }
 
+#ifdef  HAVE_LIBFDB5
+#include <fdb5/fdb5_config.h>
+#endif
+
 void cdiPrintVersion(void)
 {
   fprintf(stderr, "     CDI library version : %s\n", cdiLibraryVersion());
@@ -141,6 +145,9 @@ void cdiPrintVersion(void)
   fprintf(stderr, "    exse library version : %s\n", srvLibraryVersion());
 #endif
   fprintf(stderr, "    FILE library version : %s\n", fileLibraryVersion());
+#ifdef  HAVE_LIBFDB5
+  fprintf(stderr, "    FDB5 library version : %s\n", fdb5_version());
+#endif
 }
 
 static