autotools: use PKG_CHECK_MODULES for zlib

Replace AC_CHECK_LIB(z) with PKG_CHECK_MODULES to use the pkg-config
module shipped by zlib. This creates $(Z_LIBS) variable, replacing
hardcoded -lz in Makemodule.am files.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 4955ba9cfe403e38995fe8aedfcfe58205ec6d31..ad832f747afbe8578797177623f183fc2ed26c26 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1752,9 +1752,11 @@ AC_ARG_WITH([libz],
   AS_HELP_STRING([--without-libz], [compile without libz]),
   [], [with_libz=auto]
 )
-AS_IF([test "x$with_libz" = xno], [have_z=no], [
-  AC_CHECK_LIB([z], [crc32], [have_z=yes], [have_z=no])
+have_z=no
+AS_IF([test "x$with_libz" = xno], [], [
+  PKG_CHECK_MODULES([Z], [zlib], [have_z=yes], [have_z=no])
 ])
+AC_SUBST([Z_LIBS])
 
 AC_ARG_WITH([libmagic],
   AS_HELP_STRING([--without-libmagic], [compile without libmagic]),

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index fd60a5a59819e3eeff49be8bb967d5f5b713015f..178bb9da6a505a3c8e7de54f7ce09c769098c9cf 100644 (file)
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -122,13 +122,13 @@ sbin_PROGRAMS += fsck.cramfs
 MANPAGES += disk-utils/fsck.cramfs.8
 dist_noinst_DATA += disk-utils/fsck.cramfs.8.adoc
 fsck_cramfs_SOURCES = disk-utils/fsck.cramfs.c $(cramfs_common_sources)
-fsck_cramfs_LDADD = $(LDADD) -lz libcommon.la
+fsck_cramfs_LDADD = $(LDADD) $(Z_LIBS) libcommon.la
 
 sbin_PROGRAMS += mkfs.cramfs
 MANPAGES += disk-utils/mkfs.cramfs.8
 dist_noinst_DATA += disk-utils/mkfs.cramfs.8.adoc
 mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources)
-mkfs_cramfs_LDADD = $(LDADD) -lz libcommon.la
+mkfs_cramfs_LDADD = $(LDADD) $(Z_LIBS) libcommon.la
 endif
 
 if BUILD_FDFORMAT