Commit 8152c8aa authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Rename GRIB_API_LDFLAGS to GRIB_API_LIBS and substitute it in pkgconfig file.

parent 4ab66d10
......@@ -167,7 +167,7 @@ FPP_DEFOPT = @FPP_DEFOPT@
FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
GRIB_API_LIBS = @GRIB_API_LIBS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......
......@@ -145,7 +145,7 @@ FPP_DEFOPT = @FPP_DEFOPT@
FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
GRIB_API_LIBS = @GRIB_API_LIBS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......
......@@ -45,7 +45,7 @@
"include" : "@NETCDF_INCLUDE@"
},
"grip_api" : {
"lib" : "@GRIB_API_LDFLAGS@",
"lib" : "@GRIB_API_LIBS@",
"include" : "@GRIB_API_INCLUDE@"
},
"jasper" : {
......
......@@ -645,8 +645,8 @@ ENABLE_EXTRA
ENABLE_SERVICE
ENABLE_CGRIBEX
ENABLE_GRIB
GRIB_API_LIBS
GRIB_API_INCLUDE
GRIB_API_LDFLAGS
JASPER_LIBS
NETCDF_LIBS
NETCDF_INCLUDE
......@@ -25624,6 +25624,7 @@ fi
# ----------------------------------------------------------------------
# Compile application with GRIB_API library (for GRIB2 support)
GRIB_API_INCLUDE=''
GRIB_API_LIBS=''
 
# Check whether --with-grib_api was given.
if test "${with_grib_api+set}" = set; then :
......@@ -25783,8 +25784,7 @@ else
as_fn_error $? "Could not link to grib_api library" "$LINENO" 5
fi
 
GRIB_API_LDFLAGS=" -L$GRIB_API_ROOT/lib -lgrib_api"
GRIB_API_LIBS=" -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
......@@ -25800,6 +25800,7 @@ $as_echo "suppressed" >&6; }
fi
 
 
# ----------------------------------------------------------------------
# Enable GRIB support
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GRIB support" >&5
......
......@@ -174,7 +174,7 @@ FPP_DEFOPT = @FPP_DEFOPT@
FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
GRIB_API_LIBS = @GRIB_API_LIBS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......
......@@ -162,7 +162,7 @@ FPP_DEFOPT = @FPP_DEFOPT@
FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
GRIB_API_LIBS = @GRIB_API_LIBS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......
......@@ -220,6 +220,7 @@ AC_SUBST([JASPER_LIBS])
# ----------------------------------------------------------------------
# Compile application with GRIB_API library (for GRIB2 support)
GRIB_API_INCLUDE=''
GRIB_API_LIBS=''
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,12 +241,13 @@ AC_ARG_WITH([grib_api],
[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"])
GRIB_API_LIBS=" -L$GRIB_API_ROOT/lib -lgrib_api"
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])
AC_SUBST([GRIB_API_LIBS])
# ----------------------------------------------------------------------
# Enable GRIB support
AC_MSG_CHECKING([for GRIB support])
......
......@@ -168,7 +168,7 @@ FPP_DEFOPT = @FPP_DEFOPT@
FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
GRIB_API_LIBS = @GRIB_API_LIBS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......
......@@ -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_LIBS@ @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ @ZLIB_LIBS@ @THREADS_LIBS@
libs=-L@libdir@ -lcdi @GRIB_API_LIBS@ @JASPER_LIBS@ @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ @ZLIB_LIBS@ @THREADS_LIBS@
netcdf_root=@NETCDF_ROOT@
threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@
......@@ -20,6 +20,7 @@ netcdf_cflags=@NETCDF_INCLUDE@
netcdf_libs=@NETCDF_LIBS@
jasper_libs=@JASPER_LIBS@
grib_api_cflags=@GRIB_API_INCLUDE@
grib_api_libs=@GRIB_API_LIBS@
cdi_build_cc=@CC@
cdi_build_cflags=@CFLAGS@
cdi_build_cppflags=@CPPFLAGS@
......
......@@ -131,7 +131,7 @@ FPP_DEFOPT = @FPP_DEFOPT@
FPP_INCOPT = @FPP_INCOPT@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
GRIB_API_LIBS = @GRIB_API_LIBS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment