Substitute C compiler flags for GRIB API in pkgconfig file.

configure

@@ -25623,6 +25623,7 @@ fi
 #  ----------------------------------------------------------------------
 #  Compile application with GRIB_API library (for GRIB2 support)
+GRIB_API_INCLUDE=''
 # Check whether --with-grib_api was given.
 if test "${with_grib_api+set}" = set; then :
@@ -25785,7 +25786,6 @@ fi
                                  GRIB_API_LDFLAGS=" -L$GRIB_API_ROOT/lib -lgrib_api"
                                  GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"
-
 else
   as_fn_error $? "$GRIB_API_ROOT is not a directory! GRIB_API suppressed" "$LINENO" 5
 fi ;; #(
@@ -25799,6 +25799,7 @@ $as_echo_n "checking for the GRIB_API library... " >&6; }
 $as_echo "suppressed" >&6; }
 fi
+
 #  ----------------------------------------------------------------------
 #  Enable GRIB support
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GRIB support" >&5

m4/acx_options.m4

@@ -219,6 +219,7 @@ AC_ARG_WITH([jasper],
 AC_SUBST([JASPER_LIBS])
 #  ----------------------------------------------------------------------
 #  Compile application with GRIB_API library (for GRIB2 support)
+GRIB_API_INCLUDE=''
 AC_ARG_WITH([grib_api],
             [AS_HELP_STRING([--with-grib_api=<yes|no|directory>],
                             [library for grib2 compression; if a directory is given, it will be used as a value for --with-jasper-root])],
@@ -240,10 +241,11 @@ AC_ARG_WITH([grib_api],
                                                 [AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])],
                                                 [AC_MSG_ERROR([Could not link to grib_api library])])
                                  AC_SUBST([GRIB_API_LDFLAGS],[" -L$GRIB_API_ROOT/lib -lgrib_api"])
-                                 AC_SUBST([GRIB_API_INCLUDE],[" -I$GRIB_API_ROOT/include"])],
+                                 GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"],
                                 [AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
             [AC_MSG_CHECKING([for the GRIB_API library])
              AC_MSG_RESULT([suppressed])])
+AC_SUBST([GRIB_API_INCLUDE])
 #  ----------------------------------------------------------------------
 #  Enable GRIB support
 AC_MSG_CHECKING([for GRIB support])

src/pkgconfig/cdi.pc.in

@@ -19,6 +19,7 @@ netcdf_root=@NETCDF_ROOT@
 netcdf_cflags=@NETCDF_INCLUDE@
 netcdf_libs=@NETCDF_LIBS@
 jasper_libs=@JASPER_LIBS@
+grib_api_cflags=@GRIB_API_INCLUDE@
 
 Name: @PACKAGE_NAME@
 Description: CDI is an Interface to access Climate and NWP model Data.