[dpkg] 16/200: build: Do not enable compression libraries if the headers are not usable

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit a166517a6d2f095c96b9661e8f2519470576a513
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Nov 8 03:01:04 2016 +0100

    build: Do not enable compression libraries if the headers are not usable
---
 debian/changelog |  2 ++
 m4/dpkg-libs.m4  | 30 ++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e08ad05..ea2ea0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dpkg (1.18.14) UNRELEASED; urgency=medium
     - Do not fail tests on missing fakeroot, just skip them.
   * Build system:
     - Fix inversion logic in libmd configure check when requested explicitly.
+    - Do not consider the compressor libraries available in configure if the
+      headers are not usable.
 
   [ Updated man pages translations ]
   * German (Helge Kreutzmann).
diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index 48c4f7b..fd2b281 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -38,25 +38,23 @@ AC_DEFUN([DPKG_WITH_COMPRESS_LIB], [
   have_lib$1="no"
   AS_IF([test "x$with_lib$1" != "xno"], [
     AC_CHECK_LIB([$1], [$3], [
-      AC_DEFINE([WITH_LIB]AS_TR_CPP($1), 1,
-        [Define to 1 to use $1 library rather than console tool])
-      AS_IF([test "x$with_lib$1" = "xstatic"], [
-        dpkg_$1_libs="-Wl,-Bstatic -l$1 -Wl,-Bdynamic"
-      ], [
-        dpkg_$1_libs="-l$1"
+      AC_CHECK_HEADER([$2], [
+        have_lib$1="yes"
       ])
-      AS_TR_CPP($1)_LIBS="${AS_TR_CPP($1)_LIBS:+$AS_TR_CPP($1)_LIBS }$dpkg_$1_libs"
+    ])
 
-      AC_CHECK_HEADER([$2], [], [
-        AS_IF([test "x$with_lib$1" != "xcheck"], [
-          AC_MSG_FAILURE([lib$1 header not found])
+    AS_IF([test "x$with_lib$1" = "xyes"], [
+      AS_IF([test "x$have_lib$1" = "xyes"], [
+        AC_DEFINE([WITH_LIB]AS_TR_CPP($1), 1,
+          [Define to 1 to use $1 library rather than console tool])
+        AS_IF([test "x$with_lib$1" = "xstatic"], [
+          dpkg_$1_libs="-Wl,-Bstatic -l$1 -Wl,-Bdynamic"
+        ], [
+          dpkg_$1_libs="-l$1"
         ])
-      ])
-
-      have_lib$1="yes"
-    ], [
-      AS_IF([test "x$with_lib$1" != "xcheck"], [
-        AC_MSG_FAILURE([$1 library not found])
+        AS_TR_CPP($1)_LIBS="${AS_TR_CPP($1)_LIBS:+$AS_TR_CPP($1)_LIBS }$dpkg_$1_libs"
+      ], [
+        AC_MSG_FAILURE([lib$1 library or header not found])
       ])
     ])
   ])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git