Commit 562268bf authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Substitute szip include flags in pkgconfig file.

parent cf7da10b
......@@ -24631,7 +24631,9 @@ fi
 
 
# ----------------------------------------------------------------------
# Compile application with SZLIB library, needed for GRIB1 or for linking against hdf5/netcdf4
# Compile application with SZLIB library, needed for GRIB1 or for
# linking against hdf5/netcdf4
SZLIB_INCLUDE=''
 
# Check whether --with-szlib was given.
if test "${with_szlib+set}" = set; then :
......@@ -24715,8 +24717,6 @@ else
fi
 
SZLIB_LDFLAGS=" -lsz"
SZLIB_INCLUDE=""
;; #(
*) :
SZLIB_ROOT=$with_szlib
......@@ -24798,7 +24798,6 @@ fi
SZLIB_LDFLAGS=" -L$SZLIB_ROOT/lib -lsz"
 
SZLIB_INCLUDE=" -I$SZLIB_ROOT/include"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: $SZLIB_ROOT is not a directory! SZLIB suppressed" >&5
$as_echo "$as_me: $SZLIB_ROOT is not a directory! SZLIB suppressed" >&6;}
......@@ -24813,6 +24812,7 @@ $as_echo_n "checking for szlib library... " >&6; }
$as_echo "suppressed" >&6; }
fi
 
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
 
......
......@@ -51,7 +51,9 @@ AC_ARG_WITH([zlib],
AC_SUBST([ZLIB_INCLUDE])
AC_SUBST([ZLIB_LIBS])
# ----------------------------------------------------------------------
# Compile application with SZLIB library, needed for GRIB1 or for linking against hdf5/netcdf4
# Compile application with SZLIB library, needed for GRIB1 or for
# linking against hdf5/netcdf4
SZLIB_INCLUDE=''
AC_ARG_WITH([szlib],
[AS_HELP_STRING([--with-szlib=<yes|no|directory> (default=no)],[location of szlib library, optional for GRIB1 and NETCDF4 compression])],
[AS_CASE(["$with_szlib"],
......@@ -62,8 +64,7 @@ AC_ARG_WITH([szlib],
[sz],
[AC_DEFINE([HAVE_LIBSZ],[1],[Define to 1 for SZIP support])],
[AC_MSG_ERROR([Could not link to szlib])])
AC_SUBST([SZLIB_LDFLAGS],[" -lsz"])
AC_SUBST([SZLIB_INCLUDE],[""])],
AC_SUBST([SZLIB_LDFLAGS],[" -lsz"])],
[*],[SZLIB_ROOT=$with_szlib
AS_IF([test -d "$SZLIB_ROOT"],
[LDFLAGS="-L$SZLIB_ROOT/lib $LDFLAGS"
......@@ -74,10 +75,11 @@ AC_ARG_WITH([szlib],
[AC_DEFINE([HAVE_LIBSZ],[1],[Define to 1 for SZIP support])],
[AC_MSG_ERROR([Could not link to szlib])])
AC_SUBST([SZLIB_LDFLAGS],[" -L$SZLIB_ROOT/lib -lsz"])
AC_SUBST([SZLIB_INCLUDE],[" -I$SZLIB_ROOT/include"])],
SZLIB_INCLUDE=" -I$SZLIB_ROOT/include"],
[AC_MSG_NOTICE([$SZLIB_ROOT is not a directory! SZLIB suppressed])])])],
[AC_MSG_CHECKING([for szlib library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([SZLIB_INCLUDE])
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
AC_ARG_WITH([hdf5],
......
......@@ -10,7 +10,7 @@ threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@
zlib_cflags=@ZLIB_INCLUDE@
zlib_libs=@ZLIB_LIBS@
szlib_cflags=@SZLIB_INCLUDE@
Name: @PACKAGE_NAME@
Description: CDI is an Interface to access Climate and NWP model Data.
......
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