Rename JASPER_LDFLAGS to JASPER_LIBS and substitute it in pkgconfig file.

Makefile.in

@@ -177,7 +177,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -193,6 +193,7 @@ MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@

app/Makefile.in

@@ -155,7 +155,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -171,6 +171,7 @@ MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@

cdi.settings.in

@@ -49,7 +49,7 @@
     "include"  : "@GRIB_API_INCLUDE@"
   },
   "jasper" : {
-    "lib"      : "@JASPER_LDFLAGS@"
+    "lib"      : "@JASPER_LIBS@"
   },
   "enable_python" : @ENABLE_PYTHON@,
   "enable_ruby"   : @ENABLE_RUBY@,

configure

@@ -647,9 +647,10 @@ ENABLE_CGRIBEX
 ENABLE_GRIB
 GRIB_API_INCLUDE
 GRIB_API_LDFLAGS
-JASPER_LDFLAGS
+JASPER_LIBS
 NETCDF_LIBS
 NETCDF_INCLUDE
+NETCDF_ROOT
 NC_CONFIG
 HDF5_LIBS
 HDF5_INCLUDE
@@ -25135,6 +25136,7 @@ fi
 #  ----------------------------------------------------------------------
 #  Compile application with netcdf
+NETCDF_ROOT=''
 NETCDF_INCLUDE=''
 NETCDF_LIBS=''
@@ -25286,9 +25288,9 @@ else
   $as_echo Could not find nc-config! go on with default configuration
 fi ;; #(
   *) :
-    NETCDF_ROOT=$with_netcdf
-                          if test -d "$NETCDF_ROOT"; then :
-  LDFLAGS="-L$NETCDF_ROOT/lib $LDFLAGS"
+    if test -d "$with_netcdf"; then :
+  NETCDF_ROOT=$with_netcdf
+                                 LDFLAGS="-L$NETCDF_ROOT/lib $LDFLAGS"
                                  CPPFLAGS="-I$NETCDF_ROOT/include $CPPFLAGS"
                                  for ac_header in netcdf.h
 do :
@@ -25436,8 +25438,8 @@ else
 $as_echo "Could not find nc-config! go on with default configuration" >&6; }
 fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: $NETCDF_ROOT is not a directory! NETCDF suppressed" >&5
-$as_echo "$as_me: $NETCDF_ROOT is not a directory! NETCDF suppressed" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: $with_netcdf is not a directory! NETCDF suppressed" >&5
+$as_echo "$as_me: $with_netcdf is not a directory! NETCDF suppressed" >&6;}
 fi ;; #(
   *) :
      ;;
@@ -25451,8 +25453,10 @@ fi
+
 #  ----------------------------------------------------------------------
 #  Link application with JASPER library (needed for GRIB2 compression)
+JASPER_LIBS=''
 # Check whether --with-jasper was given.
 if test "${with_jasper+set}" = set; then :
@@ -25535,7 +25539,7 @@ else
   as_fn_error $? "Could not link to jasper library! Required for GRIB_API" "$LINENO" 5
 fi
-                            JASPER_LDFLAGS=" -ljasper"
+                            JASPER_LIBS=" -ljasper"
  ;; #(
   *) :
     JASPER_ROOT=$with_jasper
@@ -25602,8 +25606,7 @@ else
   as_fn_error $? "Could not link to jasper library! Required for GRIB_API" "$LINENO" 5
 fi
-                                 JASPER_LDFLAGS=" -L$JASPER_ROOT/lib -ljasper"
-
+                                 JASPER_LIBS=" -L$JASPER_ROOT/lib -ljasper"
 else
   as_fn_error $? "$JASPER_ROOT is not a directory! JASPER suppressed" "$LINENO" 5
 fi ;; #(
@@ -25617,6 +25620,7 @@ $as_echo_n "checking for the JASPER library... " >&6; }
 $as_echo "suppressed" >&6; }
 fi
+
 #  ----------------------------------------------------------------------
 #  Compile application with GRIB_API library (for GRIB2 support)

examples/Makefile.in

@@ -184,7 +184,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -200,6 +200,7 @@ MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@

interfaces/Makefile.in

@@ -172,7 +172,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -188,6 +188,7 @@ MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@

m4/acx_options.m4

@@ -193,6 +193,7 @@ AC_SUBST([NETCDF_INCLUDE])
 AC_SUBST([NETCDF_LIBS])
 #  ----------------------------------------------------------------------
 #  Link application with JASPER library (needed for GRIB2 compression)
+JASPER_LIBS=''
 AC_ARG_WITH([jasper],
             [AS_HELP_STRING([--with-jasper=<directory>],
                             [Specify location of JASPER library. You must specify its location if GRIB_API was built with JASPER.])],
@@ -202,7 +203,7 @@ AC_ARG_WITH([jasper],
                      [yes],[AC_CHECK_HEADERS([jasper.h])
                             AC_SEARCH_LIBS([jas_init],[jasper],[AC_DEFINE([HAVE_LIBJASPER],[1],[Define to 1 for JPEG compression for GRIB2])],
                                            [AC_MSG_ERROR([Could not link to jasper library! Required for GRIB_API])])
-                            AC_SUBST([JASPER_LDFLAGS],[" -ljasper"])],
+                            AC_SUBST([JASPER_LIBS],[" -ljasper"])],
                      [*],[JASPER_ROOT=$with_jasper
                           AS_IF([test -d "$JASPER_ROOT"],
                                 [LDFLAGS="$LDFLAGS -L$JASPER_ROOT/lib"
@@ -211,10 +212,11 @@ AC_ARG_WITH([jasper],
                                                 [jasper],
                                                 [AC_DEFINE([HAVE_LIBJASPER],[1],[Define to 1 for JPEG compression for GRIB2])],
                                                 [AC_MSG_ERROR([Could not link to jasper library! Required for GRIB_API])])
-                                 AC_SUBST([JASPER_LDFLAGS],[" -L$JASPER_ROOT/lib -ljasper"])],
+                                 JASPER_LIBS=" -L$JASPER_ROOT/lib -ljasper"],
                                 [AC_MSG_ERROR([$JASPER_ROOT is not a directory! JASPER suppressed])])])],
             [AC_MSG_CHECKING([for the JASPER library])
              AC_MSG_RESULT([suppressed])])
+AC_SUBST([JASPER_LIBS])
 #  ----------------------------------------------------------------------
 #  Compile application with GRIB_API library (for GRIB2 support)
 AC_ARG_WITH([grib_api],

src/Makefile.in

@@ -178,7 +178,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -194,6 +194,7 @@ MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@

src/pkgconfig/cdi.pc.in

@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 cflags=-I@includedir@
 fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
-libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LDFLAGS@ @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ @ZLIB_LIBS@ @THREADS_LIBS@
+libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LIBS@ @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ @ZLIB_LIBS@ @THREADS_LIBS@
 netcdf_root=@NETCDF_ROOT@
 threads_libs=@THREADS_LIBS@
 threads_cflags=@THREADS_INCLUDE@
@@ -18,6 +18,7 @@ hdf5_libs=@HDF5_LIBS@
 netcdf_root=@NETCDF_ROOT@
 netcdf_cflags=@NETCDF_INCLUDE@
 netcdf_libs=@NETCDF_LIBS@
+jasper_libs=@JASPER_LIBS@
 
 Name: @PACKAGE_NAME@
 Description: CDI is an Interface to access Climate and NWP model Data.

tests/Makefile.in

@@ -141,7 +141,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JASPER_LDFLAGS = @JASPER_LDFLAGS@
+JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -157,6 +157,7 @@ MKDIR_P = @MKDIR_P@
 NC_CONFIG = @NC_CONFIG@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NETCDF_LIBS = @NETCDF_LIBS@
+NETCDF_ROOT = @NETCDF_ROOT@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@