From 984f44479c880e268b224ea6217ee51d475d7bf7 Mon Sep 17 00:00:00 2001 From: James Laird Date: Fri, 20 May 2005 12:32:49 -0500 Subject: [PATCH] [svn-r10773] Purpose: Output tweak Description: In configure.in, users must link to zlib library, but configure then informs them that "deflate" filter is enabled. Changed output slightly to indicate that these are the same filter. Platforms tested: mir (very minor change) --- configure | 2 +- configure.in | 4 ++-- src/H5config.h.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0deb449513..33684ce135 100755 --- a/configure +++ b/configure @@ -42870,7 +42870,7 @@ _ACEOF if test "X$EXTERNAL_FILTERS" != "X"; then EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," fi - EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate" + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate(zlib)" fi diff --git a/configure.in b/configure.in index 474180deef..292e484c6e 100644 --- a/configure.in +++ b/configure.in @@ -1068,14 +1068,14 @@ case $withval in esac if test "x$HAVE_ZLIB" = "xyes" -a "x$HAVE_ZLIB_H" = "xyes" -a "x$HAVE_COMPRESS2" = "xyes"; then - AC_DEFINE([HAVE_FILTER_DEFLATE], [1], [Define if support for deflate filter is enabled]) + AC_DEFINE([HAVE_FILTER_DEFLATE], [1], [Define if support for deflate (zlib) filter is enabled]) USE_FILTER_DEFLATE="yes" dnl Add "deflate" to external filter list if test "X$EXTERNAL_FILTERS" != "X"; then EXTERNAL_FILTERS="${EXTERNAL_FILTERS}," fi - EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate" + EXTERNAL_FILTERS="${EXTERNAL_FILTERS}deflate(zlib)" fi diff --git a/src/H5config.h.in b/src/H5config.h.in index a5f0d1103e..82eef9f20b 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -54,7 +54,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FEATURES_H -/* Define if support for deflate filter is enabled */ +/* Define if support for deflate (zlib) filter is enabled */ #undef HAVE_FILTER_DEFLATE /* Define if support for Fletcher32 checksum is enabled */