xf86-video-intel: 3 commits - configure.ac src/legacy/i810

[Chris Wilson]

 configure.ac                |   22 ++++++++++++----------
 src/legacy/i810/Makefile.am |    3 ++-
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 08148896196443a8582c30b47ff546acca78d69c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 3 15:48:55 2014 +0100

    configure: XORG_DRIVER_CHECK_EXT does not create CFLAGS/LIBS variables
    
    XORG_DRIVER_CHECK_EXT only adds the package name to the list of
    REQUIRED_MODULES (which is later passed to pkg-config). For our optional
    dependencies, we must do a later call to pkg-config to verify the
    package is available and then remember to include the includes with the
    CFLAGS.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index d3ee412..9aeeb81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,7 +513,7 @@ if test "x$DRI" != "xno"; then
 
 	XORG_DRIVER_CHECK_EXT(DRI3, dri3proto)
 	if test "x$_EXT_CHECK" != "xno"; then
-		DRI3=$DRI
+		PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], [])
 	fi
 	if test "x$DRI3" != "xno"; then
 		save_CFLAGS=$CFLAGS
@@ -557,21 +557,24 @@ fi
 
 AC_CHECK_HEADERS([X11/extensions/dpmsconst.h])
 
-has_present="no"
+PRESENT="no"
 XORG_DRIVER_CHECK_EXT(PRESENT, presentproto)
 if test "x$_EXT_CHECK" != "xno"; then
+	PKG_CHECK_MODULES(PRESENT, [presentproto], [PRESENT="yes"], [])
+fi
+if test "x$PRESENT" != "xno"; then
 	save_CFLAGS=$CFLAGS
-	CFLAGS=$XORG_CFLAGS
-	AC_CHECK_HEADERS([present.h], [has_present="yes"], [], [
+	CFLAGS="$XORG_CFLAGS $PRESENT_CFLAGS"
+	AC_CHECK_HEADERS([present.h], [], [PRESENT="no"], [
 #include <xorg-server.h>
 #include <xf86str.h>
 ])
 	CFLAGS=$save_CFLAGS
 fi
 AC_MSG_CHECKING([whether to include PRESENT support])
-AM_CONDITIONAL(PRESENT, test "x$has_present" != "xno")
-AC_MSG_RESULT([$has_present])
-if test "x$has_present" != "xno"; then
+AM_CONDITIONAL(PRESENT, test "x$PRESENT" != "xno")
+AC_MSG_RESULT([$PRESENT])
+if test "x$PRESENT" != "xno"; then
         AC_DEFINE(HAVE_PRESENT,1,[Enable PRESENT driver support])
 	dri_msg="$dri_msg Present"
 fi
commit 0c81041e9b42f9df0c86c88c8648dd20ed26d0ab
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 3 15:39:50 2014 +0100

    configure: Remove xf86driproto from REQUIRED_MODULES
    
    We only depend upon the original DRI1 infrastructure when building i810
    with DRI support. So unless that is true, do not throw an error if the
    legacy protocol is absent.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 30bed3e..d3ee412 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,7 +330,6 @@ fi
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Obtain compiler/linker options for the driver dependencies
@@ -453,9 +452,9 @@ if test "x$UMS" = "xyes"; then
 	AC_DEFINE(UMS,1,[Assume UMS support])
 fi
 
-
 DRI1=no
-if test "x$DRI" != "xno" -a "x$UMS" = "xyes"; then
+XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto)
+if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then
 	PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=$DRI], [DRI1=no])
         save_CFLAGS="$CFLAGS"
         save_CPPFLAGS="$CPPFLAGS"
diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am
index 8846e4e..c44b354 100644
--- a/src/legacy/i810/Makefile.am
+++ b/src/legacy/i810/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = xvmc
 
 noinst_LTLIBRARIES = liblegacy-i810.la
 
-AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(DRI1_CFLAGS) $(PCIACCESS_CFLAGS) \
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) \
 	    -I$(top_srcdir)/src \
 	    -I$(top_srcdir)/src/legacy \
 	    $(NULL)
@@ -34,6 +34,7 @@ liblegacy_i810_la_SOURCES +=\
          i810_dri.c \
          i810_dri.h \
 	 $(NULL)
+AM_CFLAGS += $(DRI1_CFLAGS)
 
 if XVMC
 liblegacy_i810_la_SOURCES += \
commit 689ee76a14da7e5f98997ac427f457af840dea3f
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 3 10:26:46 2014 -0400

    configure: Don't link the driver against libX11
    
    78dc0c04745ad4485b994f67833f4a155749f01d added REQUIRED_MODULES to the
    driver link line for... some reason.  That pulled in the libs from the
    XF86DRI check, which near as I can tell has always been wrong, all of
    the other extension checks just look for the protocol module and
    xextproto doesn't define dri1 protocol in any case.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index 353f942..30bed3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,7 +330,7 @@ fi
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
+XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Obtain compiler/linker options for the driver dependencies