Commit 5fd9c65e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

remove LIBZ from configuration

parent 9fa7bfac
# Makefile.in generated by automake 1.14.1 from Makefile.am. # Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc. # Copyright (C) 1994-2013 Free Software Foundation, Inc.
...@@ -320,8 +320,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@ ...@@ -320,8 +320,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@ USER_NAME = @USER_NAME@
VERSION = @VERSION@ VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@ XML2_LIBS = @XML2_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@
...@@ -675,10 +673,9 @@ distcheck: dist ...@@ -675,10 +673,9 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \ && am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \ && $(am__cd) $(distdir)/_build \
&& ../configure \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) check \
......
# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # generated automatically by aclocal 1.14 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc. # Copyright (C) 1996-2013 Free Software Foundation, Inc.
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.69. [m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])]) To do so, use the procedure documented by the package, typically 'autoreconf'.])])
...@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], ...@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.14' [am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.14.1], [], m4_if([$1], [1.14], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
...@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) ...@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.14.1])dnl [AM_AUTOMAKE_VERSION([1.14])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
...@@ -261,7 +261,6 @@ case "${HOSTNAME}" in ...@@ -261,7 +261,6 @@ case "${HOSTNAME}" in
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-ia32 \ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-ia32 \
--with-netcdf=/sw/etch-ia32/netcdf-4.1.1-gcc \ --with-netcdf=/sw/etch-ia32/netcdf-4.1.1-gcc \
--with-hdf5=/sw/etch-ia32/hdf5-1.8.4-threadsafe \ --with-hdf5=/sw/etch-ia32/hdf5-1.8.4-threadsafe \
--with-zlib=/sw/etch-ia32/zlib-1.2.3 \
--with-szlib=/sw/etch-ia32/szip-2.1 \ --with-szlib=/sw/etch-ia32/szip-2.1 \
--withroj=/sw/etch-ia32/proj-4.6.0 \ --withroj=/sw/etch-ia32/proj-4.6.0 \
--enable-all-static CC=icc CFLAGS="-g -fast -openmp" AR=xiar LD=xild --enable-all-static CC=icc CFLAGS="-g -fast -openmp" AR=xiar LD=xild
...@@ -304,7 +303,6 @@ case "${HOSTNAME}" in ...@@ -304,7 +303,6 @@ case "${HOSTNAME}" in
--with-grib_api=/sw/centos58-x64/grib_api-1.12.3 \ --with-grib_api=/sw/centos58-x64/grib_api-1.12.3 \
--with-netcdf=/sw/centos58-x64/netcdf-4.2.1.1 \ --with-netcdf=/sw/centos58-x64/netcdf-4.2.1.1 \
--with-szlib=/sw/centos58-x64/szip-2.1 \ --with-szlib=/sw/centos58-x64/szip-2.1 \
--with-zlib=/usr \
CC=gcc CFLAGS="-g -Wall -O3" CC=gcc CFLAGS="-g -Wall -O3"
;; ;;
# powerpc-ibm-aix5.3.0.0 # powerpc-ibm-aix5.3.0.0
......
This diff is collapsed.
# Makefile.in generated by automake 1.14.1 from Makefile.am. # Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc. # Copyright (C) 1994-2013 Free Software Foundation, Inc.
...@@ -231,8 +231,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@ ...@@ -231,8 +231,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@ USER_NAME = @USER_NAME@
VERSION = @VERSION@ VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@ XML2_LIBS = @XML2_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@
......
...@@ -31,36 +31,11 @@ AC_SUBST([ENABLE_THREADS]) ...@@ -31,36 +31,11 @@ AC_SUBST([ENABLE_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 # Compile application with SZLIB library, needed for GRIB1 linking
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
# linking against hdf5/netcdf4
SZLIB_INCLUDE='' SZLIB_INCLUDE=''
SZLIB_LIBS='' SZLIB_LIBS=''
AC_ARG_WITH([szlib], 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_HELP_STRING([--with-szlib=<yes|no|directory> (default=no)],[location of szlib library, optional for GRIB1 compression])],
[AS_CASE(["$with_szlib"], [AS_CASE(["$with_szlib"],
[no],[AC_MSG_CHECKING([for szlib library]) [no],[AC_MSG_CHECKING([for szlib library])
AC_MSG_RESULT([suppressed])], AC_MSG_RESULT([suppressed])],
......
# Makefile.in generated by automake 1.14.1 from Makefile.am. # Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc. # Copyright (C) 1994-2013 Free Software Foundation, Inc.
...@@ -440,8 +440,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@ ...@@ -440,8 +440,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@ USER_NAME = @USER_NAME@
VERSION = @VERSION@ VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@ XML2_LIBS = @XML2_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@
......
...@@ -133,9 +133,6 @@ ...@@ -133,9 +133,6 @@
/* Define to 1 if you have the <libxml/tree.h> header file. */ /* Define to 1 if you have the <libxml/tree.h> header file. */
#undef HAVE_LIBXML_TREE_H #undef HAVE_LIBXML_TREE_H
/* Define 1 for ZLIB support */
#undef HAVE_LIBZ
/* Define to 1 if you have the <magics_api.h> header file. */ /* Define to 1 if you have the <magics_api.h> header file. */
#undef HAVE_MAGICS_API_H #undef HAVE_MAGICS_API_H
...@@ -223,9 +220,6 @@ ...@@ -223,9 +220,6 @@
/* Define to 1 if you have the <wordexp.h> header file. */ /* Define to 1 if you have the <wordexp.h> header file. */
#undef HAVE_WORDEXP_H #undef HAVE_WORDEXP_H
/* 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
......
...@@ -63,9 +63,11 @@ void printFeatures(void) ...@@ -63,9 +63,11 @@ void printFeatures(void)
#if defined(HAVE_LIBSZ) #if defined(HAVE_LIBSZ)
fprintf(stderr, " SZ"); fprintf(stderr, " SZ");
#endif #endif
/*
#if defined(HAVE_LIBZ) #if defined(HAVE_LIBZ)
fprintf(stderr, " Z"); fprintf(stderr, " Z");
#endif #endif
*/
#if defined(HAVE_LIBJASPER) #if defined(HAVE_LIBJASPER)
fprintf(stderr, " JASPER"); fprintf(stderr, " JASPER");
#endif #endif
......
# Makefile.in generated by automake 1.14.1 from Makefile.am. # Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc. # Copyright (C) 1994-2013 Free Software Foundation, Inc.
...@@ -450,8 +450,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@ ...@@ -450,8 +450,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@ USER_NAME = @USER_NAME@
VERSION = @VERSION@ VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@ XML2_LIBS = @XML2_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@
......
# Makefile.in generated by automake 1.14.1 from Makefile.am. # Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc. # Copyright (C) 1994-2013 Free Software Foundation, Inc.
...@@ -230,8 +230,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@ ...@@ -230,8 +230,6 @@ UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@ USER_NAME = @USER_NAME@
VERSION = @VERSION@ VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@ XML2_LIBS = @XML2_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@
......
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