From patchwork Tue May 3 15:59:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9006031 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E31EBBF29F for ; Tue, 3 May 2016 16:02:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F255202D1 for ; Tue, 3 May 2016 16:02:33 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3B2D20107 for ; Tue, 3 May 2016 16:02:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axckD-0006Hj-7y; Tue, 03 May 2016 16:00:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axckC-0006Hd-In for xen-devel@lists.xen.org; Tue, 03 May 2016 16:00:16 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 9A/3F-04060-F0BC8275; Tue, 03 May 2016 16:00:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXitHSDvS7/aY1 wg6lfBCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyLv08zFUzkqfhxeRFrA+NSri5GTg4JgWCJ k9d3sYLYbAIGEiumX2UEsUUEZCVWd81h72Lk4GAWKJc4ekwXJCwMVL7p7Vs2EJtFQEViXctPM JtXwFNi0985zCDlEgJyElf+JYCEhQTUJG4sXMYCUSIocXLmEzCbWUBC4uCLF8wQF3BL3D49lX kCI88sJGWzkJQtYGRaxahRnFpUllqka2igl1SUmZ5RkpuYmQPkGevlphYXJ6an5iQmFesl5+d uYgQGSD0DA+MOxm1dzocYJTmYlER5fyzRCBfiS8pPqcxILM6ILyrNSS0+xCjDwaEkwetxCign WJSanlqRlpkDDFWYtAQHj5IIrzVImre4IDG3ODMdInWKUVFKnJcfJCEAksgozYNrg8XHJUZZK WFeRgYGBiGegtSi3MwSVPlXjOIcjErCvBIgU3gy80rgpr8CWswEtDh7vSrI4pJEhJRUA+NRu4 wynp1Lzpe9F595eNspl13rfyxP+7W09M6BOMkiGetvGh9OMrHq+dW9VstLb4xf+adszcyHM/h VfrfIBi4p+KLhtGCihGnInoke4gk77j/d4ZVQuiI18dePQq93+4Os9tx6133MZ7YCq1xlhv/Z T0rzlFxX5upe6m1/sKVwvcU2db4F3kuVWIozEg21mIuKEwGaneljigIAAA== X-Env-Sender: prvs=924bf3092=anthony.perard@citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1462291213!38251030!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35152 invoked from network); 3 May 2016 16:00:14 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 3 May 2016 16:00:14 -0000 X-IronPort-AV: E=Sophos;i="5.24,573,1454976000"; d="scan'208,223";a="358113966" From: Anthony PERARD To: Date: Tue, 3 May 2016 16:59:49 +0100 Message-ID: <1462291190-20234-1-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 2.8.2 MIME-Version: 1.0 X-DLP: MIA2 Cc: Anthony PERARD , Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH for-4.7] configure: Fix when no libsystemd compat lib are available X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From systemd change log, since version 209, libsystemd.so contain everything, including libsystemd-daemon.so. Distro may, or may not provide the compatibility libraries which libsystemd-daemon is part of. So, if libsystemd-daemon is not available, check for the presence of a recent enough libsystemd. Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- Please, rerun ./autogen.sh on this patch. --- m4/systemd.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index e4b1aa5..112dc11 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -41,7 +41,9 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],, + [PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])] + ) dnl pkg-config older than 0.24 does not set these for dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 dnl of systemd pkg-config --cflags currently yields no extra flags yet. @@ -94,8 +96,10 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"], - [systemd="n"]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"],[ + PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], + [systemd="y"],[systemd="n"]) + ]) ]) dnl Enables systemd by default and requires a --disable-systemd option flag