Commit 2094603d authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

remove zlib from configure

parent 8c0bfd9d
...@@ -361,8 +361,6 @@ UUID_C_LIB = @UUID_C_LIB@ ...@@ -361,8 +361,6 @@ UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@ VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@ YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@ YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -334,8 +334,6 @@ UUID_C_LIB = @UUID_C_LIB@ ...@@ -334,8 +334,6 @@ UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@ VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@ YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@ YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
"fclibs" : "@MPI_FC_LIB@", "fclibs" : "@MPI_FC_LIB@",
"fcflags" : "@MPI_FC_INCLUDE@" "fcflags" : "@MPI_FC_INCLUDE@"
}, },
"zlib" : {
"lib" : "@ZLIB_LIBS@",
"include" : "@ZLIB_INCLUDE@"
},
"szlib" : { "szlib" : {
"lib" : "@SZLIB_LIBS@", "lib" : "@SZLIB_LIBS@",
"include" : "@SZLIB_INCLUDE@" "include" : "@SZLIB_INCLUDE@"
......
...@@ -78,7 +78,6 @@ case "${HOSTNAME}" in ...@@ -78,7 +78,6 @@ case "${HOSTNAME}" in
--with-grib_api=$HOME/local/etch-ia32/grib_api-1.9.8 \ --with-grib_api=$HOME/local/etch-ia32/grib_api-1.9.8 \
--with-netcdf=/sw/etch-ia32/netcdf-4.0.1 \ --with-netcdf=/sw/etch-ia32/netcdf-4.0.1 \
--with-hdf5=/sw/etch-ia32/hdf5-1.8.2 \ --with-hdf5=/sw/etch-ia32/hdf5-1.8.2 \
--with-zlib=/sw/etch-ia32/zlib-1.2.3 \
--with-szlib=$HOME/local/etch-ia32 \ --with-szlib=$HOME/local/etch-ia32 \
CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic" CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic"
;; ;;
...@@ -137,7 +136,6 @@ case "${HOSTNAME}" in ...@@ -137,7 +136,6 @@ case "${HOSTNAME}" in
./configure --prefix=$HOME/local \ ./configure --prefix=$HOME/local \
--with-netcdf=/sw/aix61/netcdf-4.2 \ --with-netcdf=/sw/aix61/netcdf-4.2 \
--with-hdf5=/sw/aix61/hdf5-1.8.8-threadsafe \ --with-hdf5=/sw/aix61/hdf5-1.8.8-threadsafe \
--with-zlib=/sw/aix61/zlib-1.2.6 \
--with-szlib=/sw/aix61/szip-2.1-threadsafe \ --with-szlib=/sw/aix61/szip-2.1-threadsafe \
AR="ar -X 64" LDFLAGS="-brtl" FC=xlf2003_r CC=xlc_r \ AR="ar -X 64" LDFLAGS="-brtl" FC=xlf2003_r CC=xlc_r \
CFLAGS="-g -O3 -qhot -q64 -qarch=auto -qtune=auto -qlistfmt=html=transforms -DHAVE_MMAP" \ CFLAGS="-g -O3 -qhot -q64 -qarch=auto -qtune=auto -qlistfmt=html=transforms -DHAVE_MMAP" \
......
...@@ -40,8 +40,6 @@ case "${HOSTNAME}" in ...@@ -40,8 +40,6 @@ case "${HOSTNAME}" in
$CONFIG_SHELL "$confpath/configure" \ $CONFIG_SHELL "$confpath/configure" \
--prefix="$HOME/opt/cdi-powerpc-ibm-aix6-netcdf4-pe" \ --prefix="$HOME/opt/cdi-powerpc-ibm-aix6-netcdf4-pe" \
--with-netcdf=/sw/aix61/netcdf-4.2.1.1-64bit-parallel \ --with-netcdf=/sw/aix61/netcdf-4.2.1.1-64bit-parallel \
--with-hdf5=/sw/aix61/hdf5-1.8.10-64bit-parallel \
--with-zlib=/sw/aix61/zlib-1.2.6 \
--with-szlib=/sw/aix61/szip-2.1-64bit \ --with-szlib=/sw/aix61/szip-2.1-64bit \
AR='ar -X 64' \ AR='ar -X 64' \
LDFLAGS='-g -q64 -Wl,-brtl' \ LDFLAGS='-g -q64 -Wl,-brtl' \
......
...@@ -704,8 +704,6 @@ HDF5_INCLUDE ...@@ -704,8 +704,6 @@ HDF5_INCLUDE
HDF5_ROOT HDF5_ROOT
SZLIB_LIBS SZLIB_LIBS
SZLIB_INCLUDE SZLIB_INCLUDE
ZLIB_LIBS
ZLIB_INCLUDE
THREADS_LIBS THREADS_LIBS
THREADS_INCLUDE THREADS_INCLUDE
PTHREAD_CFLAGS PTHREAD_CFLAGS
...@@ -864,7 +862,6 @@ with_sysroot ...@@ -864,7 +862,6 @@ with_sysroot
enable_libtool_lock enable_libtool_lock
enable_largefile enable_largefile
with_threads with_threads
with_zlib
with_szlib with_szlib
with_hdf5 with_hdf5
with_netcdf with_netcdf
...@@ -1593,15 +1590,11 @@ Optional Packages: ...@@ -1593,15 +1590,11 @@ Optional Packages:
(or the compiler's sysroot if not specified). (or the compiler's sysroot if not specified).
--with-threads=<yes/no/directory> --with-threads=<yes/no/directory>
Compile + link for multithreading [default=yes] Compile + link for multithreading [default=yes]
--with-zlib=<yes|no|directory> (default=yes)
location of ZLIB compression library (lib and
include subdirs), nec. for HDF5/NETCDF4
--with-szlib=<yes|no|directory> (default=no) --with-szlib=<yes|no|directory> (default=no)
location of szlib library, optional for GRIB1 and location of szlib library, optional for GRIB1 and
NETCDF4 compression NETCDF4 compression
--with-hdf5=<yes|no|directory> (default=no) --with-hdf5=<yes|no|directory> (default=no)
location of hdf5 library, NETCDF4 requires hdf5 high location of HDF5 library
level interface
--with-netcdf=<yes|no|directory> (default=no) --with-netcdf=<yes|no|directory> (default=no)
location of netcdf library (lib and include subdirs) location of netcdf library (lib and include subdirs)
--with-jasper=<directory> --with-jasper=<directory>
...@@ -26866,246 +26859,6 @@ fi ...@@ -26866,246 +26859,6 @@ fi
esac esac
   
   
# ----------------------------------------------------------------------
# Link application to ZLIB library, needed for netcdf
ZLIB_INCLUDE=''
ZLIB_LIBS=''
# Check whether --with-zlib was given.
if test "${with_zlib+set}" = set; then :
withval=$with_zlib; case "$with_zlib" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB library" >&5
$as_echo_n "checking for ZLIB library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
for ac_header in zlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
if test "x$ac_cv_header_zlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
$as_echo_n "checking for library containing deflate... " >&6; }
if ${ac_cv_search_deflate+:} 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 deflate ();
int
main ()
{
return deflate ();
;
return 0;
}
_ACEOF
for ac_lib in '' z; 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_deflate=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_deflate+:} false; then :
break
fi
done
if ${ac_cv_search_deflate+:} false; then :
else
ac_cv_search_deflate=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
$as_echo "$ac_cv_search_deflate" >&6; }
ac_res=$ac_cv_search_deflate
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
fi
ZLIB_LIBS=" -lz" ;; #(
*) :
ZLIB_ROOT=$with_zlib
LDFLAGS="-L$ZLIB_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$ZLIB_ROOT/include $CPPFLAGS"
for ac_header in zlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
if test "x$ac_cv_header_zlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
$as_echo_n "checking for library containing deflate... " >&6; }
if ${ac_cv_search_deflate+:} 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 deflate ();
int
main ()
{
return deflate ();
;
return 0;
}
_ACEOF
for ac_lib in '' z; 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_deflate=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_deflate+:} false; then :
break
fi
done
if ${ac_cv_search_deflate+:} false; then :
else
ac_cv_search_deflate=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
$as_echo "$ac_cv_search_deflate" >&6; }
ac_res=$ac_cv_search_deflate
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
fi
ZLIB_INCLUDE=" -I$ZLIB_ROOT/include"
ZLIB_LIBS=" -L$ZLIB_ROOT/lib -lz" ;; #(
*) :
;;
esac
else
for ac_header in zlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
if test "x$ac_cv_header_zlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
$as_echo_n "checking for library containing deflate... " >&6; }
if ${ac_cv_search_deflate+:} 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 deflate ();
int
main ()
{
return deflate ();
;
return 0;
}
_ACEOF
for ac_lib in '' z; 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_deflate=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_deflate+:} false; then :
break
fi
done
if ${ac_cv_search_deflate+:} false; then :
else
ac_cv_search_deflate=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5
$as_echo "$ac_cv_search_deflate" >&6; }
ac_res=$ac_cv_search_deflate
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
fi
ZLIB_LIBS=" -lz"
fi
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Compile application with SZLIB library, needed for GRIB1 or for # Compile application with SZLIB library, needed for GRIB1 or for
# linking against hdf5/netcdf4 # linking against hdf5/netcdf4
...@@ -27373,7 +27126,7 @@ if test "$ac_res" != no; then : ...@@ -27373,7 +27126,7 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h $as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h
   
else 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 fi
   
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5
...@@ -27431,8 +27184,8 @@ if test "$ac_res" != no; then : ...@@ -27431,8 +27184,8 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_hdf5_hl=yes have_hdf5_hl=yes
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find hdf5 high level interface! It is required for netCDF4." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot find hdf5 high level interface!" >&5
$as_echo "$as_me: Cannot find hdf5 high level interface! It is required for netCDF4." >&6;} $as_echo "$as_me: Cannot find hdf5 high level interface!" >&6;}
have_hdf5_hl=no have_hdf5_hl=no
fi fi
   
...@@ -27516,7 +27269,7 @@ if test "$ac_res" != no; then : ...@@ -27516,7 +27269,7 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h $as_echo "#define HAVE_LIBHDF5 1" >>confdefs.h
   
else 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 fi
   
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5DSis_scale" >&5
...@@ -27574,14 +27327,8 @@ if test "$ac_res" != no; then : ...@@ -27574,14 +27327,8 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_hdf5_hl=yes have_hdf5_hl=yes
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Cannot link to hdf5 high level interface! It is required for netCDF4.\ { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot link to hdf5 high level interface!" >&5
HDF5 must be built with zlib; the location of zlib must be specified for HDF5 with the \ $as_echo "$as_me: Cannot link to hdf5 high level interface!" >&6;}
--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;}
have_hdf5_hl=no have_hdf5_hl=no
fi fi
   
...@@ -382,8 +382,6 @@ UUID_C_LIB = @UUID_C_LIB@ ...@@ -382,8 +382,6 @@ UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@ VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@ YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@ YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -376,8 +376,6 @@ UUID_C_LIB = @UUID_C_LIB@ ...@@ -376,8 +376,6 @@ UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@ VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@ YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@ YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -360,8 +360,6 @@ UUID_C_LIB = @UUID_C_LIB@ ...@@ -360,8 +360,6 @@ UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@ VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@ YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@ YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -27,30 +27,6 @@ AS_CASE([$with_threads], ...@@ -27,30 +27,6 @@ AS_CASE([$with_threads],
AC_SUBST([THREADS_INCLUDE]) AC_SUBST([THREADS_INCLUDE])
AC_SUBST([THREADS_LIBS]) AC_SUBST([THREADS_LIBS])
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Link application to ZLIB library, needed for netcdf
ZLIB_INCLUDE=''
ZLIB_LIBS=''
AC_ARG_WITH([zlib],
[AS_HELP_STRING([--with-zlib=<yes|no|directory> (default=yes)],[location of ZLIB compression library (lib and include subdirs), nec. for HDF5/NETCDF4])],
[AS_CASE(["$with_zlib"],
[no],[AC_MSG_CHECKING([for ZLIB library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS(zlib.h)
AC_SEARCH_LIBS([deflate],[z],[AC_DEFINE([HAVE_LIBZ],[1],[Define 1 for ZLIB support])])
ZLIB_LIBS=" -lz"],
[*],[ZLIB_ROOT=$with_zlib
LDFLAGS="-L$ZLIB_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$ZLIB_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS(zlib.h)
AC_SEARCH_LIBS([deflate],[z],[AC_DEFINE([HAVE_LIBZ],[1],[Define 1 for ZLIB support])])
ZLIB_INCLUDE=" -I$ZLIB_ROOT/include"
ZLIB_LIBS=" -L$ZLIB_ROOT/lib -lz"])],
[AC_CHECK_HEADERS(zlib.h)
AC_SEARCH_LIBS([deflate],[z],[AC_DEFINE([HAVE_LIBZ],[1],[Define 1 for ZLIB support])])
ZLIB_LIBS=" -lz"])
AC_SUBST([ZLIB_INCLUDE])
AC_SUBST([ZLIB_LIBS])
# ----------------------------------------------------------------------
# Compile application with SZLIB library, needed for GRIB1 or for # Compile application with SZLIB library, needed for GRIB1 or for
# linking against hdf5/netcdf4 # linking against hdf5/netcdf4
SZLIB_INCLUDE='' SZLIB_INCLUDE=''
...@@ -88,7 +64,7 @@ HDF5_ROOT='' ...@@ -88,7 +64,7 @@ HDF5_ROOT=''
HDF5_INCLUDE='' HDF5_INCLUDE=''
HDF5_LIBS='' HDF5_LIBS=''
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])],
[AS_CASE(["$with_hdf5"], [AS_CASE(["$with_hdf5"],
[no],[AC_MSG_CHECKING([for hdf5 library]) [no],[AC_MSG_CHECKING([for hdf5 library])
AC_MSG_RESULT([suppressed])], AC_MSG_RESULT([suppressed])],
...@@ -96,11 +72,11 @@ AC_ARG_WITH([hdf5], ...@@ -96,11 +72,11 @@ AC_ARG_WITH([hdf5],
AC_SEARCH_LIBS([H5Fopen], AC_SEARCH_LIBS([H5Fopen],
[hdf5], [hdf5],
[AC_DEFINE([HAVE_LIBHDF5],[1],[Define to 1 for HDF5 support])], [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], AC_SEARCH_LIBS([H5DSis_scale],
[hdf5_hl], [hdf5_hl],
[have_hdf5_hl=yes], [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]) have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = xyes], AS_IF([test "x$have_libhdf5_hl" = xyes],
[HDF5_LIBS=" -lhdf5_hl -lhdf5"], [HDF5_LIBS=" -lhdf5_hl -lhdf5"],
...@@ -114,14 +90,11 @@ AC_ARG_WITH([hdf5], ...@@ -114,14 +90,11 @@ AC_ARG_WITH([hdf5],
AC_SEARCH_LIBS([H5Fopen], AC_SEARCH_LIBS([H5Fopen],
[hdf5], [hdf5],
[AC_DEFINE([HAVE_LIBHDF5],[1],[Define to 1 for HDF5 support])], [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], AC_SEARCH_LIBS([H5DSis_scale],
[hdf5_hl], [hdf5_hl],
[have_hdf5_hl=yes], [have_hdf5_hl=yes],
[AC_MSG_NOTICE([Cannot link to hdf5 high level interface! It is required for netCDF4.\ [AC_MSG_NOTICE([Cannot link to hdf5 high level interface!])
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..])
have_hdf5_hl=no]) have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = 'xyes'], AS_IF([test "x$have_libhdf5_hl" = 'xyes'],
[HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"], [HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"],
......
...@@ -445,8 +445,6 @@ UUID_C_LIB = @UUID_C_LIB@ ...@@ -445,8 +445,6 @@ UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@ VERSION = @VERSION@
YAXT_CFLAGS = @YAXT_CFLAGS@ YAXT_CFLAGS = @YAXT_CFLAGS@
YAXT_LIBS = @YAXT_LIBS@ YAXT_LIBS = @YAXT_LIBS@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
...@@ -946,8 +944,8 @@ distclean-generic: ...@@ -946,8 +944,8 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@ENABLE_CDI_LIB_FALSE@install-exec-local:
@ENABLE_CDI_LIB_FALSE@uninstall-local: @ENABLE_CDI_LIB_FALSE@uninstall-local:
@ENABLE_CDI_LIB_FALSE@install-exec-local:
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
......
...@@ -136,9 +136,6 @@ ...@@ -136,9 +136,6 @@
/* Define to 1 for SZIP support */ /* Define to 1 for SZIP support */
#undef HAVE_LIBSZ #undef HAVE_LIBSZ
/* Define 1 for ZLIB support */
#undef HAVE_LIBZ
/* Define to 1 if you have the `mallinfo' function. */ /* Define to 1 if you have the `mallinfo' function. */
#undef HAVE_MALLINFO #undef HAVE_MALLINFO
...@@ -223,9 +220,6 @@ ...@@ -223,9 +220,6 @@
/* yaxt library is available */ /* yaxt library is available */
#undef HAVE_YAXT #undef HAVE_YAXT
/* Define to 1 if you have the <zlib.h> header file. */
#undef HAVE_ZLIB_H
/* Host name */ /* Host name */
#undef HOST_NAME #undef HOST_NAME
......
...@@ -7,8 +7,6 @@ fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@ ...@@ -7,8 +7,6 @@ fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
libs=-L@libdir@ -lcdi @GRIB_API_LIBS@ @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@
threads_libs=@THREADS_LIBS@ threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@ threads_cflags=@THREADS_INCLUDE@
zlib_cflags=@ZLIB_INCLUDE@
zlib_libs=@ZLIB_LIBS@
szlib_cflags=@SZLIB_INCLUDE@