[Reproducible-commits] [dpkg] 28/105: build: Split libps and libkvm detection into their own macros and variables

[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 e2e1d11a1367c724aa4a6e42d4e129ade0090eb6
Author: Guillem Jover <guillem at debian.org>
Date:   Fri Mar 4 01:32:52 2016 +0100

    build: Split libps and libkvm detection into their own macros and variables
    
    Do not tie these libraries in a single variable for start-stop-daemon,
    instead move the usage to the Makefile.am.
---
 configure.ac      |  3 ++-
 debian/changelog  |  1 +
 m4/dpkg-libs.m4   | 25 ++++++++++++++++++-------
 utils/Makefile.am |  4 +++-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 824a720..ba57e11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,8 @@ if test "x$build_dselect" = "xyes"; then
    DPKG_LIB_CURSES
 fi
 if test "x$build_start_stop_daemon" = "xyes"; then
-   DPKG_LIB_SSD
+   DPKG_LIB_PS
+   DPKG_LIB_KVM
 fi
 
 # Checks for header files.
diff --git a/debian/changelog b/debian/changelog
index fde7273..cf606d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,7 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
   * Build system:
     - Fix building development documentation.
     - Remove unused UA_LIBS variable.
+    - Split libps and libkvm detection into their own macros and variables.
   * 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 3b1ce40..a393dcb 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -153,11 +153,22 @@ if test "x$have_curses_header" != "xyes"; then
 fi
 ])# DPKG_LIB_CURSES
 
-# DPKG_LIB_SSD
+# DPKG_LIB_PS
+# -----------
+# Check for GNU/Hurd ps library
+AC_DEFUN([DPKG_LIB_PS], [
+  AC_ARG_VAR([PS_LIBS], [linker flags for ps library])dnl
+  AC_CHECK_LIB([ps], [proc_stat_list_create], [
+    PS_LIBS="-lps"
+  ])
+])# DPKG_LIB_PS
+
+# DPKG_LIB_KVM
 # ------------
-# Check for start-stop-daemon libraries.
-AC_DEFUN([DPKG_LIB_SSD],
-[AC_ARG_VAR([SSD_LIBS], [linker flags for start-stop-daemon])dnl
-AC_CHECK_LIB([ps], [proc_stat_list_create], [SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lps"])
-AC_CHECK_LIB([kvm], [kvm_openfiles], [SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lkvm"])
-])# DPKG_LIB_SSD
+# Check for BSD kvm library
+AC_DEFUN([DPKG_LIB_KVM], [
+  AC_ARG_VAR([KVM_LIBS], [linker flags for kvm library])dnl
+  AC_CHECK_LIB([kvm], [kvm_openfiles], [
+    KVM_LIBS="-lkvm"
+  ])
+])# DPKG_LIB_KVM
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 120926b..83378ad 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -44,7 +44,9 @@ start_stop_daemon_SOURCES = \
 
 start_stop_daemon_LDADD = \
 	../lib/compat/libcompat.la \
-	$(SSD_LIBS)
+	$(PS_LIBS) \
+	$(KVM_LIBS) \
+	$(nil)
 endif
 
 install-data-local:

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