From patchwork Fri Nov 8 19:14:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UsODwqltaSBDYXJkb25h?= X-Patchwork-Id: 3159971 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B72FAC045B for ; Fri, 8 Nov 2013 21:41:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3B1B2047C for ; Fri, 8 Nov 2013 21:41:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5656520460 for ; Fri, 8 Nov 2013 21:41:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 25B981058E8; Fri, 8 Nov 2013 13:41:18 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 4198 seconds by postgrey-1.32 at gabe; Fri, 08 Nov 2013 13:41:14 PST Received: from smtpfb1-g21.free.fr (smtpfb1-g21.free.fr [212.27.42.9]) by gabe.freedesktop.org (Postfix) with ESMTP id ED4981058F2 for ; Fri, 8 Nov 2013 13:41:13 -0800 (PST) Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by smtpfb1-g21.free.fr (Postfix) with ESMTP id 8986177CED2 for ; Fri, 8 Nov 2013 20:15:04 +0100 (CET) Received: from localhost.localdomain (unknown [88.187.37.62]) by smtp2-g21.free.fr (Postfix) with ESMTP id DE50E4B00F1 for ; Fri, 8 Nov 2013 20:15:00 +0100 (CET) From: =?UTF-8?q?R=C3=A9mi=20Cardona?= To: intel-gfx@lists.freedesktop.org Date: Fri, 8 Nov 2013 20:14:59 +0100 Message-Id: <1383938099-7218-1-git-send-email-remi@gentoo.org> X-Mailer: git-send-email 1.8.4.2 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] configure: Use proper variables set by PKG_CHECK_MODULES X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 $DRI_CFLAGS does not actually exist. The PKG_CHECK_MODULES call creates a $DRI1_CFLAGS variable instead. This doesn't break often because "recent" versions of xorg-server.pc indirectly depend on xf86driproto.pc thus bringing in the required CFLAGS through $XORG_CFLAGS. Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=490342 Signed-off-by: Rémi Cardona --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index eb20807..539ad9b 100644 --- a/configure.ac +++ b/configure.ac @@ -396,8 +396,8 @@ if test "x$enable_dri" != "xno" -a "x$UMS" = "xyes"; then PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1="yes"], [DRI1="no"]) save_CFLAGS="$CFLAGS" save_CPPFLAGS="$CPPFLAGS" - CFLAGS="$CFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" - CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" + CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" + CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [DRI1="yes"], [DRI1="no"], [/* for dri.h */ #include @@ -440,7 +440,7 @@ if test "x$enable_dri" != "xno"; then AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) if test "x$DRI2" != "xno"; then save_CFLAGS=$CFLAGS - CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS" + CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI1_CFLAGS $DRI2_CFLAGS" AC_CHECK_HEADERS([dri2.h], DRI2="yes", DRI2="no", [ #include #include