[Reproducible-commits] [dpkg] 29/105: build: Make it possible to build without system libmd

[Niko Tyni]

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

ntyni pushed a commit to branch ntyni/reproducible_builds
in repository dpkg.

commit 11d243dc17e2c55418af79f6af997e30a57bd099
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Mar 5 02:30:18 2016 +0100

    build: Make it possible to build without system libmd
---
 debian/changelog |  1 +
 m4/dpkg-libs.m4  | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf606d0..27bd153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
     - Fix building development documentation.
     - Remove unused UA_LIBS variable.
     - Split libps and libkvm detection into their own macros and variables.
+    - Make it possible to build without system libmd.
   * Test suite:
     - Add a unit test to compile perl code with warnings.
     - Add a unit test for the trigger deferred parser.
diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index a393dcb..95f3652 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -7,12 +7,24 @@
 # Check for the message digest library.
 AC_DEFUN([DPKG_LIB_MD], [
   AC_ARG_VAR([MD_LIBS], [linker flags for md library])
-  AC_CHECK_HEADERS([md5.h], [
-    AC_CHECK_LIB([md], [MD5Init], [have_libmd=yes], [
-      AC_MSG_FAILURE([md5 digest not found in libmd])
-    ])
+  AC_ARG_WITH([libmd], [
+    AS_HELP_STRING([--with-libmd],
+                   [use libmd library for message digest functions])
+  ], [
+    with_libmd="$withval"
+  ], [
+    with_libmd="no"
   ])
-  AS_IF([test "x$have_libmd" = "xyes"], [MD_LIBS="-lmd"])
+  if test "x$with_libmd" != "xno"; then
+    AC_CHECK_HEADERS([md5.h], [
+      AC_CHECK_LIB([md], [MD5Init], [
+        with_libmd="yes"
+      ], [
+        AC_MSG_FAILURE([md5 digest not found in libmd])
+      ])
+    ])
+  fi
+  AS_IF([test "x$with_libmd" = "xyes"], [MD_LIBS="-lmd"])
   AM_CONDITIONAL([HAVE_LIBMD_MD5], [test "x$ac_cv_lib_md_MD5Init" = "xyes"])
 ])# DPKG_LIB_MD
 

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