[dpkg] 186/200: build: Do not fail on missing compression libraries or headers on check mode

[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 6acaea0708bd7f7c1e261fbb50e429b1efe10368
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Feb 18 20:31:49 2017 +0100

    build: Do not fail on missing compression libraries or headers on check mode
    
    This is supposed to be the automatic detection mode, so we should cope
    gracefully with any of these being missing.
    
    Regression introduced in commit a166517a6d2f095c96b9661e8f2519470576a513.
---
 debian/changelog | 2 ++
 m4/dpkg-libs.m4  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eec8e89..a5fc775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ dpkg (1.18.23) UNRELEASED; urgency=medium
       systems the header is not self-contained.
     - Handle libmd implementations built into system libc, as found on some
       BSD systems.
+    - Do not fail on missing compression libraries or headers on automatic
+      detection mode. Regression introduced in dpkg 1.18.14.
 
  -- Guillem Jover <guillem at debian.org>  Wed, 01 Feb 2017 06:28:28 +0100
 
diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index 2150d2a..7431c64 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -59,7 +59,9 @@ AC_DEFUN([DPKG_WITH_COMPRESS_LIB], [
         ])
         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])
+        AS_IF([test "x$with_lib$1" != "xcheck"], [
+          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