Commit 7c573170 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

config: remove HDF5

parent bc2125ad
......@@ -287,9 +287,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
......@@ -260,9 +260,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
......@@ -700,9 +700,6 @@ ENABLE_NC4
ENABLE_NC2
ENABLE_NETCDF
NC_CONFIG
HDF5_LIBS
HDF5_INCLUDE
HDF5_ROOT
SZLIB_LIBS
SZLIB_INCLUDE
THREADS_LIBS
......@@ -864,7 +861,6 @@ enable_libtool_lock
enable_largefile
with_threads
with_szlib
with_hdf5
with_netcdf
with_jasper
with_openjpeg
......@@ -1594,8 +1590,6 @@ Optional Packages:
--with-szlib=<yes|no|directory> (default=no)
location of szlib library, optional for GRIB1 and
NETCDF4 compression
--with-hdf5=<yes|no|directory> (default=no)
location of HDF5 library
--with-netcdf=<yes|no|directory> (default=no)
location of NetCDF library (lib and include subdirs)
--with-jasper=<directory>
......@@ -27043,319 +27037,6 @@ fi
 
 
 
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
HDF5_ROOT=''
HDF5_INCLUDE=''
HDF5_LIBS=''
# Check whether --with-hdf5 was given.
if test "${with_hdf5+set}" = set; then :
withval=$with_hdf5; case "$with_hdf5" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hdf5 library" >&5
$as_echo_n "checking for hdf5 library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
for ac_header in hdf5.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
if test "x$ac_cv_header_hdf5_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_HDF5_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5Fopen" >&5
$as_echo_n "checking for library containing H5Fopen... " >&6; }
if ${ac_cv_search_H5Fopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char H5Fopen ();
int
main ()
{
return H5Fopen ();
;
return 0;
}
_ACEOF
for ac_lib in '' hdf5; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_H5Fopen=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_H5Fopen+:} false; then :
break
fi
done
if ${ac_cv_search_H5Fopen+:} false; then :
else
ac_cv_search_H5Fopen=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_H5Fopen" >&5
$as_echo "$ac_cv_search_H5Fopen" >&6; }
ac_res=$ac_cv_search_H5Fopen
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h
else
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
$as_echo_n "checking for library containing H5DSis_scale... " >&6; }
if ${ac_cv_search_H5DSis_scale+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char H5DSis_scale ();
int
main ()
{
return H5DSis_scale ();
;
return 0;
}
_ACEOF
for ac_lib in '' hdf5_hl; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_H5DSis_scale=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_H5DSis_scale+:} false; then :
break
fi
done
if ${ac_cv_search_H5DSis_scale+:} false; then :
else
ac_cv_search_H5DSis_scale=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_H5DSis_scale" >&5
$as_echo "$ac_cv_search_H5DSis_scale" >&6; }
ac_res=$ac_cv_search_H5DSis_scale
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!" >&5
$as_echo "$as_me: Cannot find hdf5 high level interface!" >&6;}
have_hdf5_hl=no
fi
if test "x$have_libhdf5_hl" = xyes; then :
HDF5_LIBS=" -lhdf5_hl -lhdf5"
else
HDF5_LIBS=" -lhdf5"
fi
;; #(
*) :
if test -d "$with_hdf5"; then :
HDF5_ROOT="$with_hdf5"
LDFLAGS="-L$HDF5_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$HDF5_ROOT/include $CPPFLAGS"
for ac_header in hdf5.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
if test "x$ac_cv_header_hdf5_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_HDF5_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5Fopen" >&5
$as_echo_n "checking for library containing H5Fopen... " >&6; }
if ${ac_cv_search_H5Fopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char H5Fopen ();
int
main ()
{
return H5Fopen ();
;
return 0;
}
_ACEOF
for ac_lib in '' hdf5; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_H5Fopen=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_H5Fopen+:} false; then :
break
fi
done
if ${ac_cv_search_H5Fopen+:} false; then :
else
ac_cv_search_H5Fopen=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_H5Fopen" >&5
$as_echo "$ac_cv_search_H5Fopen" >&6; }
ac_res=$ac_cv_search_H5Fopen
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h
else
as_fn_error $? "Cannot link to hdf5!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5
$as_echo_n "checking for library containing H5DSis_scale... " >&6; }
if ${ac_cv_search_H5DSis_scale+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char H5DSis_scale ();
int
main ()
{
return H5DSis_scale ();
;
return 0;
}
_ACEOF
for ac_lib in '' hdf5_hl; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_H5DSis_scale=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_H5DSis_scale+:} false; then :
break
fi
done
if ${ac_cv_search_H5DSis_scale+:} false; then :
else
ac_cv_search_H5DSis_scale=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_H5DSis_scale" >&5
$as_echo "$ac_cv_search_H5DSis_scale" >&6; }
ac_res=$ac_cv_search_H5DSis_scale
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!" >&5
$as_echo "$as_me: Cannot link to hdf5 high level interface!" >&6;}
have_hdf5_hl=no
fi
if test "x$have_libhdf5_hl" = 'xyes'; then :
HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"
else
HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5"
fi
HDF5_INCLUDE=" -I$HDF5_ROOT/include"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: $with_hdf5 is not a directory! HDF5 suppressed" >&5
$as_echo "$as_me: $with_hdf5 is not a directory! HDF5 suppressed" >&6;}
fi ;; #(
*) :
;;
esac
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hdf5 library" >&5
$as_echo_n "checking for hdf5 library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; }
fi
# ----------------------------------------------------------------------
# Compile application with netcdf
NETCDF_ROOT=''
......@@ -308,9 +308,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
......@@ -302,9 +302,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
......@@ -30,15 +30,15 @@ noinst_PROGRAMS += CdiInfo
noinst_LTLIBRARIES += libcdipp.la
endif
#
locallibs = $(top_builddir)/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@
locallibs = $(top_builddir)/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LIBS@ @SZLIB_LIBS@
libcdipp_la_SOURCES = cdi.cpp cdi.hpp
libcdipp_la_LIBADD = $(top_builddir)/src/libcdi.la
libcdipp_la_LDFLAGS = @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
libcdipp_la_LDFLAGS = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
CdiInfo_SOURCES = CdiInfo.cpp
CdiInfo_LDADD = libcdipp.la
CdiInfo_LDFLAGS = @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
CdiInfo_LDFLAGS = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
#
#
if ENABLE_RUBY
......
......@@ -286,9 +286,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -439,13 +436,13 @@ EXTRA_DIST = $(SWIGCDIOBJ) $(SWIGCDILIB) \
noinst_LTLIBRARIES = $(am__append_3)
#
locallibs = $(top_builddir)/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@
locallibs = $(top_builddir)/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LIBS@ @SZLIB_LIBS@
libcdipp_la_SOURCES = cdi.cpp cdi.hpp
libcdipp_la_LIBADD = $(top_builddir)/src/libcdi.la
libcdipp_la_LDFLAGS = @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
libcdipp_la_LDFLAGS = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
CdiInfo_SOURCES = CdiInfo.cpp
CdiInfo_LDADD = libcdipp.la
CdiInfo_LDFLAGS = @NETCDF_LIBS@ @HDF5_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
CdiInfo_LDFLAGS = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
#
AM_CPPFLAGS = -I$(top_srcdir)/src
#
......
......@@ -59,54 +59,6 @@ AC_ARG_WITH([szlib],
AC_SUBST([SZLIB_INCLUDE])
AC_SUBST([SZLIB_LIBS])
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
HDF5_ROOT=''
HDF5_INCLUDE=''
HDF5_LIBS=''
AC_ARG_WITH([hdf5],
[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])],
[yes],[AC_CHECK_HEADERS([hdf5.h])
AC_SEARCH_LIBS([H5Fopen],
[hdf5],
[AC_DEFINE([HAVE_LIBHDF5],[1],[Define to 1 for HDF5 support])],
[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!])
have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = xyes],
[HDF5_LIBS=" -lhdf5_hl -lhdf5"],
[HDF5_LIBS=" -lhdf5"])
],
[*],[AS_IF([test -d "$with_hdf5"],
[HDF5_ROOT="$with_hdf5"
LDFLAGS="-L$HDF5_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$HDF5_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([hdf5.h])
AC_SEARCH_LIBS([H5Fopen],
[hdf5],
[AC_DEFINE([HAVE_LIBHDF5],[1],[Define to 1 for HDF5 support])],
[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!])
have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = 'xyes'],
[HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"],
[HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5"])
HDF5_INCLUDE=" -I$HDF5_ROOT/include"],
[AC_MSG_NOTICE([$with_hdf5 is not a directory! HDF5 suppressed])])])],
[AC_MSG_CHECKING([for hdf5 library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([HDF5_ROOT])
AC_SUBST([HDF5_INCLUDE])
AC_SUBST([HDF5_LIBS])
# ----------------------------------------------------------------------
# Compile application with netcdf
NETCDF_ROOT=''
NETCDF_INCLUDE=''
......
......@@ -371,9 +371,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
......@@ -79,9 +79,6 @@
/* Define to 1 if you have the `grib_get_length' function. */
#undef HAVE_GRIB_GET_LENGTH
/* Define to 1 if you have the <hdf5.h> header file. */
#undef HAVE_HDF5_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
......@@ -100,9 +97,6 @@
/* GRIB_API library is present if defined to 1 */
#undef HAVE_LIBGRIB_API
/* Define to 1 for HDF5 support */
#undef HAVE_LIBHDF5
/* Define to 1 for IEG interface */
#undef HAVE_LIBIEG
......
......@@ -384,9 +384,6 @@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@
HAVE_PARALLEL_NC4 = @HAVE_PARALLEL_NC4@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LIBS = @HDF5_LIBS@
HDF5_ROOT = @HDF5_ROOT@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_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