Commit 3c3bee8d authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Substitute HDF5 C compiler flags in pkgconfig file.

parent ae717489
...@@ -24815,6 +24815,7 @@ fi ...@@ -24815,6 +24815,7 @@ fi
   
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4 # Link application with HDF5 library, required for netcdf4
HDF5_INCLUDE=''
   
# Check whether --with-hdf5 was given. # Check whether --with-hdf5 was given.
if test "${with_hdf5+set}" = set; then : if test "${with_hdf5+set}" = set; then :
...@@ -24964,8 +24965,7 @@ else ...@@ -24964,8 +24965,7 @@ else
HDF5_LDFLAGS=" -lhdf5" HDF5_LDFLAGS=" -lhdf5"
   
fi fi
HDF5_INCLUDE="" ;; #(
;; #(
*) : *) :
HDF5_ROOT=$with_hdf5 HDF5_ROOT=$with_hdf5
if test -d "$HDF5_ROOT"; then : if test -d "$HDF5_ROOT"; then :
...@@ -25117,7 +25117,6 @@ else ...@@ -25117,7 +25117,6 @@ else
   
fi fi
HDF5_INCLUDE=" -I$HDF5_ROOT/include" HDF5_INCLUDE=" -I$HDF5_ROOT/include"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: $HDF5_ROOT is not a directory! HDF5 suppressed" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: $HDF5_ROOT is not a directory! HDF5 suppressed" >&5
$as_echo "$as_me: $HDF5_ROOT is not a directory! HDF5 suppressed" >&6;} $as_echo "$as_me: $HDF5_ROOT is not a directory! HDF5 suppressed" >&6;}
...@@ -25132,6 +25131,7 @@ $as_echo_n "checking for hdf5 library... " >&6; } ...@@ -25132,6 +25131,7 @@ $as_echo_n "checking for hdf5 library... " >&6; }
$as_echo "suppressed" >&6; } $as_echo "suppressed" >&6; }
fi fi
   
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Compile application with netcdf # Compile application with netcdf
   
......
...@@ -84,6 +84,7 @@ AC_SUBST([SZLIB_INCLUDE]) ...@@ -84,6 +84,7 @@ AC_SUBST([SZLIB_INCLUDE])
AC_SUBST([SZLIB_LIBS]) AC_SUBST([SZLIB_LIBS])
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4 # Link application with HDF5 library, required for netcdf4
HDF5_INCLUDE=''
AC_ARG_WITH([hdf5], AC_ARG_WITH([hdf5],
[AS_HELP_STRING([--with-hdf5=<yes|no|directory> (default=no)],[location of hdf5 library, NETCDF4 requires hdf5 high level interface])], [AS_HELP_STRING([--with-hdf5=<yes|no|directory> (default=no)],[location of hdf5 library, NETCDF4 requires hdf5 high level interface])],
[AS_CASE(["$with_hdf5"], [AS_CASE(["$with_hdf5"],
...@@ -102,7 +103,7 @@ AC_ARG_WITH([hdf5], ...@@ -102,7 +103,7 @@ AC_ARG_WITH([hdf5],
AS_IF([test "x$have_libhdf5_hl" = 'xyes'], AS_IF([test "x$have_libhdf5_hl" = 'xyes'],
[AC_SUBST([HDF5_LDFLAGS],[" -lhdf5_hl -lhdf5"])], [AC_SUBST([HDF5_LDFLAGS],[" -lhdf5_hl -lhdf5"])],
[AC_SUBST([HDF5_LDFLAGS],[" -lhdf5"])]) [AC_SUBST([HDF5_LDFLAGS],[" -lhdf5"])])
AC_SUBST([HDF5_INCLUDE],[""])], ],
[*],[HDF5_ROOT=$with_hdf5 [*],[HDF5_ROOT=$with_hdf5
AS_IF([test -d "$HDF5_ROOT"], AS_IF([test -d "$HDF5_ROOT"],
[LDFLAGS="-L$HDF5_ROOT/lib $LDFLAGS" [LDFLAGS="-L$HDF5_ROOT/lib $LDFLAGS"
...@@ -123,10 +124,11 @@ AC_ARG_WITH([hdf5], ...@@ -123,10 +124,11 @@ AC_ARG_WITH([hdf5],
AS_IF([test "x$have_libhdf5_hl" = 'xyes'], AS_IF([test "x$have_libhdf5_hl" = 'xyes'],
[AC_SUBST([HDF5_LDFLAGS],[" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"])], [AC_SUBST([HDF5_LDFLAGS],[" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"])],
[AC_SUBST([HDF5_LDFLAGS],[" -L$HDF5_ROOT/lib -lhdf5"])]) [AC_SUBST([HDF5_LDFLAGS],[" -L$HDF5_ROOT/lib -lhdf5"])])
AC_SUBST([HDF5_INCLUDE],[" -I$HDF5_ROOT/include"])], HDF5_INCLUDE=" -I$HDF5_ROOT/include"],
[AC_MSG_NOTICE([$HDF5_ROOT is not a directory! HDF5 suppressed])])])], [AC_MSG_NOTICE([$HDF5_ROOT is not a directory! HDF5 suppressed])])])],
[AC_MSG_CHECKING([for hdf5 library]) [AC_MSG_CHECKING([for hdf5 library])
AC_MSG_RESULT([suppressed])]) AC_MSG_RESULT([suppressed])])
AC_SUBST([HDF5_INCLUDE])
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Compile application with netcdf # Compile application with netcdf
AC_ARG_WITH([netcdf], AC_ARG_WITH([netcdf],
......
...@@ -12,6 +12,7 @@ zlib_cflags=@ZLIB_INCLUDE@ ...@@ -12,6 +12,7 @@ zlib_cflags=@ZLIB_INCLUDE@
zlib_libs=@ZLIB_LIBS@ zlib_libs=@ZLIB_LIBS@
szlib_cflags=@SZLIB_INCLUDE@ szlib_cflags=@SZLIB_INCLUDE@
szlib_libs=@SZLIB_LIBS@ szlib_libs=@SZLIB_LIBS@
hdf5_cflags=@HDF5_INCLUDE@
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Description: CDI is an Interface to access Climate and NWP model Data. Description: CDI is an Interface to access Climate and NWP model Data.
......
Supports Markdown
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