From patchwork Thu Aug 3 13:34:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Latvala X-Patchwork-Id: 9879123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59A9660311 for ; Thu, 3 Aug 2017 13:41:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DEB1288EC for ; Thu, 3 Aug 2017 13:41:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42AA9288F7; Thu, 3 Aug 2017 13:41:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A8D6288EC for ; Thu, 3 Aug 2017 13:41:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F26A6E1E5; Thu, 3 Aug 2017 13:41:24 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 376 seconds by postgrey-1.35 at gabe; Thu, 03 Aug 2017 13:41:22 UTC Received: from johanna1.inet.fi (mta-out1.inet.fi [62.71.2.233]) by gabe.freedesktop.org (Postfix) with ESMTP id E57486E1E5 for ; Thu, 3 Aug 2017 13:41:22 +0000 (UTC) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 80 2014-11-10_18-01-23 260f8afb9361da3c7edfd3a8e3a4ca908191ad29 RazorGate-KAS: Lua profiles 69136 [Nov 12 2014] RazorGate-KAS: Method: none Received: from hufflepuff.adrinael.net (84.248.197.237) by johanna1.inet.fi (9.0.002.03-2-gbe5d057) id 59831E9D0000EAAC; Thu, 3 Aug 2017 16:35:05 +0300 Received: from adrinael by hufflepuff.adrinael.net with local (Exim 4.84_2) (envelope-from ) id 1ddGHJ-0006Eg-SY; Thu, 03 Aug 2017 16:35:05 +0300 From: Petri Latvala To: intel-gfx@lists.freedesktop.org Date: Thu, 3 Aug 2017 16:34:45 +0300 Message-Id: <1501767285-23837-1-git-send-email-petri.latvala@intel.com> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH i-g-t] configure.ac: Try to find XMLRPC with xmlrpc-c-config if pkg-config fails X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Debian and Ubuntu have XMLRPC packages without pkg-config files. Let's do automatically what the user would anyway do manually. Signed-off-by: Petri Latvala CC: Daniel Vetter CC: Paul Kocialkowski CC: Lyude --- configure.ac | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6d3db87..2ceea2c 100644 --- a/configure.ac +++ b/configure.ac @@ -191,8 +191,19 @@ AC_ARG_ENABLE(chamelium, AS_HELP_STRING([--enable-chamelium], [enable_chamelium=no]) AM_CONDITIONAL(HAVE_CHAMELIUM, [test "x$enable_chamelium" = xyes]) if test "x$enable_chamelium" = xyes; then - PKG_CHECK_MODULES(XMLRPC, xmlrpc xmlrpc_util xmlrpc_client, [], - [AC_MSG_ERROR([Failed to find xmlrpc, required by chamelium.])]) + PKG_CHECK_MODULES(XMLRPC, xmlrpc xmlrpc_util xmlrpc_client, + [xmlrpc=yes], [xmlrpc=no]) + if test x"$xmlrpc" != xyes; then + AC_CHECK_PROG([XMLRPC_C_CONFIG], [xmlrpc-c-config], [yes], [no]) + if test x"$XMLRPC_C_CONFIG" = xyes; then + XMLRPC_CFLAGS=$(xmlrpc-c-config client --cflags) + XMLRPC_LIBS=$(xmlrpc-c-config client --libs) + AC_SUBST(XMLRPC_CFLAGS) + AC_SUBST(XMLRPC_LIBS) + else + AC_MSG_ERROR([Failed to find xmlrpc, required by chamelium.]) + fi + fi PKG_CHECK_MODULES(PIXMAN, pixman-1, [], [AC_MSG_ERROR([Failed to find pixman, required by chamelium.])]) if test x"$udev" != xyes; then