xf86-video-intel: 3 commits - configure.ac src/Makefile.am src/sna/kgem.c

[Chris Wilson]

 configure.ac    |    8 ++++----
 src/Makefile.am |    2 +-
 src/sna/kgem.c  |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5840bfe285e3fd9dc550cbe5fa87437870c92038
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Aug 12 19:31:53 2013 +0200

    Link the driver against pixman

diff --git a/src/Makefile.am b/src/Makefile.am
index 16b6967..b0781ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,7 @@ AM_CFLAGS = \
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
+intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(XORG_LIBS)
 
 if SNA
 SUBDIRS += sna
commit b2df6cc8f0bcac6311f2b1d0c008add9b7d05787
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Aug 12 14:45:04 2013 +0200

    configure: use CPPFLAGS for xaa.h check, not CFLAGS
    
    CFLAGS aren't passed to the preprocessor, which then can't find the
    header.
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/configure.ac b/configure.ac
index 318863e..43c33eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,10 +263,10 @@ AC_ARG_ENABLE(xaa,
 	      [XAA="$enableval"],
 	      [XAA=auto])
 if test "x$XAA" != xno; then
-        save_CFLAGS=$CFLAGS
-        CFLAGS=$XORG_CFLAGS
+        save_CPPFLAGS=$CPPFLAGS
+        CPPFLAGS=$XORG_CFLAGS
 	AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
-        CFLAGS=$save_CFLAGS
+        CPPFLAGS=$save_CPPFLAGS
 fi
 AC_MSG_CHECKING([whether to include XAA support])
 AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
commit d661332de946c356c10a75e29a48f2c2e3599fec
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Aug 12 14:38:22 2013 +0200

    Check for struct sysinfo as well as <sys/sysinfo.h>
    
    Non-linux glibc systems have the latter but not the former.
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/configure.ac b/configure.ac
index 2559254..318863e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,7 @@ AC_ARG_ENABLE(sna,
 
 if test "x$SNA" != "xno"; then
 	AC_DEFINE(USE_SNA, 1, [Enable SNA support])
-	AC_CHECK_HEADERS([sys/sysinfo.h])
+	AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct sysinfo.totalram], [], [], [[#include <sys/sysinfo.h>]]))
 fi
 AC_MSG_CHECKING([whether to include SNA support])
 AM_CONDITIONAL(SNA, test x$SNA != xno)
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 5afe05f..98e801a 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -46,7 +46,7 @@
 #include <memcheck.h>
 #endif
 
-#if HAVE_SYS_SYSINFO_H
+#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
 #include <sys/sysinfo.h>
 #endif
 
@@ -694,7 +694,7 @@ agp_aperture_size(struct pci_device *dev, unsigned gen)
 static size_t
 total_ram_size(void)
 {
-#if HAVE_SYS_SYSINFO_H
+#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
 	struct sysinfo info;
 	if (sysinfo(&info) == 0)
 		return info.totalram * info.mem_unit;