build: use pkgconfig to detect zlib
build: explicitly call PKG_PROG_PKG_CONFIG
Per the manual page, PKG_PROG_PKG_CONFIG needs to be invoked
explicitly if PKG_CHECK_MODULES might not happen (it is indeed stowed
in an AS_IF in kmod). Without this, funny failures can occur.
(As it did.)
diff --git a/configure.ac b/configure.ac
index d17d611..21a63b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,7 @@
AC_PROG_SED
AC_PROG_MKDIR_P
-
-required_private_libs=""
+PKG_PROG_PKG_CONFIG
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
@@ -56,17 +55,10 @@
AS_HELP_STRING([--enable-zlib], [handle gzipped modules @<:@default=disabled@:>@]),
[], enable_zlib=no)
AS_IF([test "x$enable_zlib" != "xno"], [
- AC_CHECK_LIB([z], [gzopen], [
- zlib_libs="-lz"
- required_private_libs="${required_private_libs} ${zlib_libs}"
- AC_DEFINE(ENABLE_ZLIB, [1], [Enable zlib for modules.])
- AC_SUBST(zlib_libs)
- ],
- [AC_MSG_ERROR([zlib is not present])
- ])
+ PKG_CHECK_MODULES([zlib], [zlib])
+ AC_DEFINE([ENABLE_ZLIB], [1], [Enable zlib for modules.])
], [
AC_MSG_NOTICE([zlib support not requested])
- zlib_libs=""
])
AC_ARG_ENABLE([debug],
@@ -123,8 +115,6 @@
-Wl,--gc-sections])
-AC_SUBST(required_private_libs)
-
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_FILES([
Makefile
