code.ossystems Code Review - openembedded-core.git/blob

   1 From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001
   2 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
   3 Date: Mon, 16 Nov 2015 16:18:40 +0200
   4 Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check
   5
   6 REQUIRED_LIBS needs to be set to the correct systemd library,
   7 otherwise the later check will either fail or use the wrong
   8 pc file.
   9
  10 Upstream-Status: Submitted [xorg-devel@lists.x.org]
  11 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  12 ---
  13  configure.ac | 13 ++++++++++---
  14  1 file changed, 10 insertions(+), 3 deletions(-)
  15
  16 diff --git a/configure.ac b/configure.ac
  17 index 96c0242..f63eca1 100644
  18 --- a/configure.ac
  19 +++ b/configure.ac
  20 @@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon],
  21                 [support systemd socket activation (default: auto)]),
  22         [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
  23  PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
  24 -                  [HAVE_SYSTEMD_DAEMON=yes],
  25 +                  [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon],
  26                    [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
  27 -                                     [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])])
  28 +                                     [REQUIRED_SYSTEMD_DAEMON=libsystemd],
  29 +                                     [REQUIRED_SYSTEMD_DAEMON=])])
  30 +if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then
  31 +        HAVE_SYSTEMD_DAEMON=no
  32 +else
  33 +        HAVE_SYSTEMD_DAEMON=yes
  34 +fi
  35 +
  36  if test "x$WITH_SYSTEMD_DAEMON" = xauto; then
  37         WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON"
  38  fi
  39 @@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then
  40                 AC_MSG_ERROR([systemd support requested but no library has been found])
  41         fi
  42         AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
  43 -       REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
  44 +       REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON"
  45  fi
  46  AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
  47
  48 --
  49 2.1.4
  50