From patchwork Thu May 12 20:47:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Pivotto X-Patchwork-Id: 9086111 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C763E9F372 for ; Thu, 12 May 2016 20:49:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 035D42024D for ; Thu, 12 May 2016 20:49:03 +0000 (UTC) Received: from emsm-gh1-uea10.nsa.gov (emsm-gh1-uea10.nsa.gov [8.44.101.8]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 077BD201F5 for ; Thu, 12 May 2016 20:49:01 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.24,610,1454976000"; d="scan'208";a="13647060" IronPort-PHdr: =?us-ascii?q?9a23=3AAgh3qxCVqREHHVNBSQivUyQJP3N1i/DPJgcQr6Af?= =?us-ascii?q?oPdwSP/7pMbcNUDSrc9gkEXOFd2CrakU2qyP4uu5BDRIyK3CmU5BWaQEbwUCh8?= =?us-ascii?q?QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYsExnyfTB4?= =?us-ascii?q?Ov7yUtaLyZ/nhqbrqtaKPl0ArQH+SI0xBS3+lR/WuMgSjNkqAYcK4TyNnEF1ff?= =?us-ascii?q?9Lz3hjP1OZkkW0zM6x+Jl+73YY4Kp5pIZ9S6GyQ4AUBfwdVWxnYCgJ45jgrRTJ?= =?us-ascii?q?QA2O+nw0Tn8biQtTRQPC6VWyRZrttSz+rcJhwiSBLNawRrcxHXy54qNqTgL4oD?= =?us-ascii?q?sWPD4+tmfMg4p/i7wIjgimokld3orVbYfdDPtgeb/BeptOX21AUstVXjRFH4Kx?= =?us-ascii?q?R4oJEusdJqBVst+u9BM1sRKiCFz0V6vUwThSiyqzhPU3?= X-IPAS-Result: =?us-ascii?q?A2G8DgDQ6zRX/wHyM5BegzhVfqUUAgEQCwaBD4FYFgGJSIl?= =?us-ascii?q?UHwOBc4QCA4E9TAEBAQEBAQICYieCLX5bRAI3FCAOAwkCFykICAMBLRUYBwsFG?= =?us-ascii?q?ASIDgQBvW0lhV2JJREBhXUFh36QKYV+iCACgjWHH4VBAkWOegJig21shnyBNQE?= =?us-ascii?q?BAQ?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 May 2016 20:48:53 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u4CKmgl7006317; Thu, 12 May 2016 16:48:44 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u4CKmf1w147654 for ; Thu, 12 May 2016 16:48:41 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u4CKmeXU006315 for ; Thu, 12 May 2016 16:48:40 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1DHBgAk6zRXigLxl1hehA1+pScJAQEBBYFWinCFSYQTEgiFeoIHAQEBAQEBEwEBAQoUCYYSgT+IRQG+FIVdjywFh36QKYV+iCACgjWMYAJFjnoCghgBX4FXbIgxAQEB X-IPAS-Result: A1DHBgAk6zRXigLxl1hehA1+pScJAQEBBYFWinCFSYQTEgiFeoIHAQEBAQEBEwEBAQoUCYYSgT+IRQG+FIVdjywFh36QKYV+iCACgjWMYAJFjnoCghgBX4FXbIgxAQEB X-IronPort-AV: E=Sophos;i="5.24,610,1454994000"; d="scan'208";a="5445990" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 12 May 2016 16:48:40 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AO+zmHhfsK5zPJBEFYgzTe6+6lGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxc6ybB7h7PlgxGXEQZ/co6odzbGG4ua5CCdZvM7JmUtBWaIPfidNsd?= =?us-ascii?q?8RkQ0kDZzNImzAB9muURYHGt9fXkRu5XCxPBsdMs//Y1rPvi/6tmZKSV3BPAZ4?= =?us-ascii?q?bt74BpTVx5zukbviqtuKMk4R2WL1SIgxBSv1hD2ZjtMRj4pmJ/R54TryiVwMRd?= =?us-ascii?q?5rw3h1L0mYhRf265T41pdi9yNNp6BprJYYAu2pN5g/GLdAAT4rNWEp4+X3rxTY?= =?us-ascii?q?XBDJ7XwZFi0NnwZPBAzexA3gU4zgqW3xse85kDKXOczwUKAcRSWp76AtTgThzi?= =?us-ascii?q?gAKW0X6mbS3+5tiKNWplqZpgJ435LTKNWPM/tyc6fUZdcHRGdpX8BMVjBaRI6h?= =?us-ascii?q?OdhcR9EdNPpV+tGu72AFqgGzUFGh?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0GdDADQ6zRXigLxl1hehA1KNKUnCwEFg?= =?us-ascii?q?VaBEReJSIVJhBMSCIFzhAeCBwEBAQEBAQICDwEBAQoUCVCCLX5bgTyBP4hFAb4?= =?us-ascii?q?ShV2PLAWHfpAphX6IIAKCNYxgAkWOegKCGAFfgVdsiDEBAQE?= X-IPAS-Result: =?us-ascii?q?A0GdDADQ6zRXigLxl1hehA1KNKUnCwEFgVaBEReJSIVJhBM?= =?us-ascii?q?SCIFzhAeCBwEBAQEBAQICDwEBAQoUCVCCLX5bgTyBP4hFAb4ShV2PLAWHfpAph?= =?us-ascii?q?X6IIAKCNYxgAkWOegKCGAFfgVdsiDEBAQE?= X-IronPort-AV: E=Sophos;i="5.24,610,1454976000"; d="scan'208";a="16111276" Received: from mail.inuits.eu (HELO zimbra.inuits.be) ([88.151.241.2]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 May 2016 20:48:06 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.inuits.be (Postfix) with ESMTP id E813344213; Thu, 12 May 2016 22:48:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.inuits.be Received: from zimbra.inuits.be ([127.0.0.1]) by localhost (zimbra.inuits.be [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pabEr4MoIDot; Thu, 12 May 2016 22:48:03 +0200 (CEST) Received: from localhost (unknown [194.110.69.68]) by zimbra.inuits.be (Postfix) with ESMTPSA id EA79244211; Thu, 12 May 2016 22:48:02 +0200 (CEST) From: Julien Pivotto To: cpebenito@tresys.com, setools@tresys.com, selinux@tycho.nsa.gov Subject: [PATCH] setools3: Allow to override PKG_CONFIG Date: Thu, 12 May 2016 22:47:59 +0200 Message-Id: <1463086079-5456-1-git-send-email-roidelapluie@inuits.eu> X-Mailer: git-send-email 2.6.1 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 --- configure.ac | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index 8de2b7e..d595f0c 100644 --- a/configure.ac +++ b/configure.ac @@ -692,30 +692,27 @@ AC_ARG_WITH(test-policies, AC_CACHE_SAVE -dnl check for pkg-config -AC_CHECK_PROG(has_pkg_config, pkg-config, yes, no) -if test ${has_pkg_config} = "no"; then - AC_MSG_ERROR([pkg-config not found]) -fi +dnl check for ${PKG_CONFIG} +PKG_PROG_PKG_CONFIG AC_MSG_CHECKING([for libxml]) -pkg-config --exists 'libxml-2.0' +${PKG_CONFIG} --exists 'libxml-2.0' if test $? -ne 0 ; then AC_MSG_ERROR([setools requires libxml-2.0]) fi -XML_CFLAGS=`pkg-config --cflags libxml-2.0` -XML_LIBS=`pkg-config --libs libxml-2.0` +XML_CFLAGS=`${PKG_CONFIG} --cflags libxml-2.0` +XML_LIBS=`${PKG_CONFIG} --libs libxml-2.0` AC_MSG_RESULT([yes]) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS) AC_MSG_CHECKING([for sqlite3]) -pkg-config --exists 'sqlite3 >= 3.2.0' +${PKG_CONFIG} --exists 'sqlite3 >= 3.2.0' if test $? -ne 0 ; then AC_MSG_ERROR([setools requires sqlite3 3.2.0 or greater]) fi -SQLITE3_CFLAGS=`pkg-config --cflags sqlite3` -SQLITE3_LIBS=`pkg-config --libs sqlite3` +SQLITE3_CFLAGS=`${PKG_CONFIG} --cflags sqlite3` +SQLITE3_LIBS=`${PKG_CONFIG} --libs sqlite3` AC_MSG_RESULT([yes]) AC_SUBST(SQLITE3_CFLAGS) AC_SUBST(SQLITE3_LIBS) @@ -727,47 +724,47 @@ gtk_version_2_8=1 if test "x${build_gui}" = xyes; then AC_MSG_CHECKING([for GTK]) - pkg-config --atleast-version=2.4 gtk+-2.0 + ${PKG_CONFIG} --atleast-version=2.4 gtk+-2.0 if test $? -ne 0; then AC_MSG_ERROR([setools requires GTK+ 2.4 or greater]) fi - pkg-config --atleast-version=2.8 gtk+-2.0 + ${PKG_CONFIG} --atleast-version=2.8 gtk+-2.0 gtk_version_2_8=$? - GTK_CFLAGS=`pkg-config --cflags gtk+-2.0` - GTK_LIBS=`pkg-config --libs gtk+-2.0` + GTK_CFLAGS=`${PKG_CONFIG} --cflags gtk+-2.0` + GTK_LIBS=`${PKG_CONFIG} --libs gtk+-2.0` AC_MSG_RESULT([yes]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_MSG_CHECKING([for libglade]) - pkg-config --exists 'libglade-2.0' + ${PKG_CONFIG} --exists 'libglade-2.0' if test $? -ne 0; then AC_MSG_ERROR([setools requires libglade-2.0; make sure libglade2-devel is installed]) fi - GLADE_CFLAGS=`pkg-config --cflags libglade-2.0` - GLADE_LIBS=`pkg-config --libs libglade-2.0` + GLADE_CFLAGS=`${PKG_CONFIG} --cflags libglade-2.0` + GLADE_LIBS=`${PKG_CONFIG} --libs libglade-2.0` AC_MSG_RESULT([yes]) AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_LIBS) AC_MSG_CHECKING([for gdk-pixbuf]) - pkg-config --exists 'gdk-pixbuf-2.0' + ${PKG_CONFIG} --exists 'gdk-pixbuf-2.0' if test $? -ne 0; then AC_MSG_ERROR([setools requires gdk-pixbuf-2.0]) fi - PIXBUF_CFLAGS=`pkg-config --cflags gdk-pixbuf-2.0` - PIXBUF_LIBS=`pkg-config --libs gdk-pixbuf-2.0` + PIXBUF_CFLAGS=`${PKG_CONFIG} --cflags gdk-pixbuf-2.0` + PIXBUF_LIBS=`${PKG_CONFIG} --libs gdk-pixbuf-2.0` AC_MSG_RESULT([yes]) AC_SUBST(PIXBUF_CFLAGS) AC_SUBST(PIXBUF_LIBS) AC_MSG_CHECKING([for gthread]) - pkg-config --exists 'gthread-2.0' + ${PKG_CONFIG} --exists 'gthread-2.0' if test $? -ne 0; then AC_MSG_ERROR([setools requires gthread-2.0]) fi - GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0` - GTHREAD_LIBS=`pkg-config --libs gthread-2.0` + GTHREAD_CFLAGS=`${PKG_CONFIG} --cflags gthread-2.0` + GTHREAD_LIBS=`${PKG_CONFIG} --libs gthread-2.0` AC_MSG_RESULT([yes]) AC_SUBST(GTHREAD_CFLAGS) AC_SUBST(GTHREAD_LIBS) @@ -795,13 +792,13 @@ AC_CHECK_LIB(bz2, ) #AC_MSG_CHECKING([for FUSE]) -#pkg-config --exists fuse +#${PKG_CONFIG} --exists fuse #if test $? -ne 0; then # AC_MSG_WARN([FUSE not found; libsefs tests will not be built]) # have_fuse="no" #else -# FUSE_CFLAGS=`pkg-config --cflags fuse` -# FUSE_LIBS=`pkg-config --libs fuse` +# FUSE_CFLAGS=`${PKG_CONFIG} --cflags fuse` +# FUSE_LIBS=`${PKG_CONFIG} --libs fuse` # AC_SUBST(FUSE_CFLAGS) # AC_SUBST(FUSE_LIBS) # have_fuse="yes"