Przeglądaj źródła

build: Make it possible to build without system libmd

Guillem Jover 10 lat temu
rodzic
commit
11d243dc17
2 zmienionych plików z 18 dodań i 5 usunięć
  1. 1 0
      debian/changelog
  2. 17 5
      m4/dpkg-libs.m4

+ 1 - 0
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.

+ 17 - 5
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