From patchwork Wed Oct 28 12:46:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UsODwqltaSBDYXJkb25h?= X-Patchwork-Id: 56278 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9SClaqi006013 for ; Wed, 28 Oct 2009 12:47:36 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC1719F4C0; Wed, 28 Oct 2009 05:47:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by gabe.freedesktop.org (Postfix) with ESMTP id BB02B9EB35 for ; Wed, 28 Oct 2009 05:47:29 -0700 (PDT) Received: from smtp2-g21.free.fr (localhost [127.0.0.1]) by smtp2-g21.free.fr (Postfix) with ESMTP id EAD9F4B01D5 for ; Wed, 28 Oct 2009 13:47:25 +0100 (CET) Received: from localhost.localdomain (bne75-10-88-178-16-229.fbx.proxad.net [88.178.16.229]) by smtp2-g21.free.fr (Postfix) with ESMTP id AE0794B012F for ; Wed, 28 Oct 2009 13:47:22 +0100 (CET) From: =?UTF-8?q?R=C3=A9mi=20Cardona?= To: intel-gfx@lists.freedesktop.org Date: Wed, 28 Oct 2009 13:46:38 +0100 Message-Id: <38038bcbf1aea0c4f25fa5bd3187ee1d98c41be7.1256733443.git.remi@gentoo.org> X-Mailer: git-send-email 1.6.5.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/5] configure: check for libdrm and libpciaccess earlier X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 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 diff --git a/configure.ac b/configure.ac index 19dbf13..8661887 100644 --- a/configure.ac +++ b/configure.ac @@ -91,13 +91,14 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.11]) +PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) -drm_cflags=$(pkg-config --cflags libdrm) # Checks for libraries. @@ -105,8 +106,8 @@ drm_cflags=$(pkg-config --cflags libdrm) AC_HEADER_STDC save_CFLAGS="$CFLAGS" -CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" -CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" +CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" +CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" AC_MSG_CHECKING([whether to include DRI support]) if test x$DRI != xno; then AC_CHECK_FILE([${sdkdir}/dri.h], @@ -129,8 +130,6 @@ fi AC_MSG_RESULT([$DRI]) CFLAGS="$save_CFLAGS $DEBUGFLAGS" -PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) - dnl Use lots of warning flags with GCC WARN_CFLAGS="" @@ -141,7 +140,6 @@ if test "x$GCC" = "xyes"; then -Wnested-externs -fno-strict-aliasing" fi -PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.11]) AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [xf86driproto glproto])