[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5c95355

The following commit has been merged in the master branch:
commit 5c9535595a6a52e40e21c2e6de737caacdd9d899
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 14 16:26:23 2006 +0000

    Extended autoconf tests to check for zlib header file, preparations for conditional compilation of zlib dependent code
---
 config/config.h.in  | 3 +++
 config/config.mk.in | 5 -----
 config/configure.ac | 6 +++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index dd9f597..52cb7fc 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -106,6 +106,9 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
+/* Define to 1 if you have the `zlib' library. */
+#undef HAVE_ZLIB_H
+
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
diff --git a/config/config.mk.in b/config/config.mk.in
index bb01cad..6c8b50f 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -32,11 +32,6 @@
 EXIV2_VERSION = @PACKAGE_VERSION@
 
 # **********************************************************************
-# Define which libraries (shared and/or static) to build
-# This setting is now controlled by GNU configure and libtool, see 
-# the top level directory README and configure --help
-
-# **********************************************************************
 # Libtool
 LIBTOOL = $(top_srcdir)/libtool
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/config/configure.ac b/config/configure.ac
index d5b9a93..22c8ac6 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -21,7 +21,11 @@ AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 
 # Checks for libraries.
-AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
+AC_CHECK_LIB(z, uncompress, [AC_CHECK_HEADERS([zlib.h], HAVE_ZLIB=1)])
+if test -z "$HAVE_ZLIB"; then
+  AC_MSG_ERROR([I did not find a copy of the zlib library and the zlib.h 
+header file on your system. You can get it from http://www.gzip.org/zlib/])
+fi
 
 # Checks for header files.
 AC_HEADER_STDC

-- 
exiv2 packaging