Skip to content

GitLab

Commit d7a494ff authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

remove LIBZ from configuration

parent 5fd9c65e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 22 deletions
configure
View file @ d7a494ff
......@@ -1515,8 +1515,7 @@ Optional Packages:
location of szlib library, optional for GRIB1
compression
--with-hdf5=<yes|no|directory> (default=no)
location of hdf5 library, NETCDF4 requires hdf5 high
level interface
location of HDF5 library
--with-netcdf=<yes|no|directory> (default=no)
location of netCDF library (lib and include subdirs)
--with-cmor=<directory> Specify location of CMOR library.
......@@ -18583,7 +18582,7 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h
 
else
as_fn_error $? "Cannot link to hdf5 library! It is required for Netcdf4" "$LINENO" 5
as_fn_error $? "Cannot link to hdf5 library!" "$LINENO" 5
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5
......@@ -18641,8 +18640,8 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_hdf5_hl=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find hdf5 high level interface! It is required for netCDF4." >&5
$as_echo "$as_me: Cannot find hdf5 high level interface! It is required for netCDF4." >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find hdf5 high level interface!" >&5
$as_echo "$as_me: Cannot find hdf5 high level interface!" >&6;}
have_hdf5_hl=no
fi
 
......@@ -18726,7 +18725,7 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h
 
else
as_fn_error $? "Cannot link to hdf5! It is required for netCDF4." "$LINENO" 5
as_fn_error $? "Cannot link to hdf5!" "$LINENO" 5
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5
......@@ -18784,14 +18783,8 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_hdf5_hl=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot link to hdf5 high level interface! It is required for netCDF4.\
HDF5 must be built with zlib; the location of zlib must be specified for HDF5 with the \
--with-zlib option. If HDF5 was also built with szlib, then the location of szlib must also be \
specified with the --with-szlib option.." >&5
$as_echo "$as_me: Cannot link to hdf5 high level interface! It is required for netCDF4.\
HDF5 must be built with zlib; the location of zlib must be specified for HDF5 with the \
--with-zlib option. If HDF5 was also built with szlib, then the location of szlib must also be \
specified with the --with-szlib option.." >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot link to hdf5 high level interface!" >&5
$as_echo "$as_me: Cannot link to hdf5 high level interface!" >&6;}
have_hdf5_hl=no
fi
 
......
m4/acx_options.m4
View file @ d7a494ff
......@@ -67,7 +67,7 @@ HDF5_ROOT=''
HDF5_INCLUDE=''
HDF5_LIBS=''
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])],
[AS_CASE(["$with_hdf5"],
[no],[AC_MSG_CHECKING([for hdf5 library])
AC_MSG_RESULT([suppressed])],
......@@ -75,11 +75,11 @@ AC_ARG_WITH([hdf5],
AC_SEARCH_LIBS([H5Fopen],
[hdf5],
[AC_DEFINE([HAVE_LIBHDF5],[1],[Define to 1 for HDF5 support])],
[AC_MSG_ERROR([Cannot link to hdf5 library! It is required for Netcdf4])])
[AC_MSG_ERROR([Cannot link to hdf5 library!])])
AC_SEARCH_LIBS([H5DSis_scale],
[hdf5_hl],
[have_hdf5_hl=yes],
[AC_MSG_NOTICE([Cannot find hdf5 high level interface! It is required for netCDF4.])
[AC_MSG_NOTICE([Cannot find hdf5 high level interface!])
have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = xyes],
[HDF5_LIBS=" -lhdf5_hl -lhdf5"],
......@@ -93,14 +93,11 @@ AC_ARG_WITH([hdf5],
AC_SEARCH_LIBS([H5Fopen],
[hdf5],
[AC_DEFINE([HAVE_LIBHDF5],[1],[Define to 1 for HDF5 support])],
[AC_MSG_ERROR([Cannot link to hdf5! It is required for netCDF4.])])
[AC_MSG_ERROR([Cannot link to hdf5!])])
AC_SEARCH_LIBS([H5DSis_scale],
[hdf5_hl],
[have_hdf5_hl=yes],
[AC_MSG_NOTICE([Cannot link to hdf5 high level interface! It is required for netCDF4.\
HDF5 must be built with zlib; the location of zlib must be specified for HDF5 with the \
--with-zlib option. If HDF5 was also built with szlib, then the location of szlib must also be \
specified with the --with-szlib option..])
[AC_MSG_NOTICE([Cannot link to hdf5 high level interface!])
have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = 'xyes'],
[HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"],
......
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