Detect when Render is available and turn those tests on.

4 files changed, 18 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a7722ec..2121a4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-13  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	* x11perf.c:
+	* x11perf.h:
+	Detect when Render is available and turn those tests on.
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index fce0fb2..a6c2b97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,12 @@ AC_TYPE_SIGNAL
 PKG_CHECK_MODULES(X11PERF, x11 xmuu)
 AC_SUBST(X11PERF_CFLAGS)
 AC_SUBST(X11PERF_LIBS)
+PKG_CHECK_MODULES(XRENDER, xrender xft, have_xrender=yes, have_xrender=no)
+if test "x$have_xrender" = "xyes"; then
+	AC_DEFINE(XRENDER, 1, [Define to 1 if you have xrender and xft])
+	X11PERF_CFLAGS="$X11PERF_CFLAGS $XRENDER_CFLAGS"
+	X11PERF_LIBS="$X11PERF_LIBS $XRENDER_LIBS"
+fi
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
diff --git a/x11perf.c b/x11perf.c
index 164bd5a..c8ac0b2 100644
--- a/x11perf.c
+++ b/x11perf.c
@@ -1,5 +1,5 @@
 /* $Xorg: x11perf.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: app/x11perf/x11perf.c,v 1.3 2005/07/26 18:55:42 alanc Exp $ */
 /****************************************************************************
 Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -24,10 +24,6 @@ SOFTWARE.
 ****************************************************************************/
 /* $XFree86: xc/programs/x11perf/x11perf.c,v 3.6 2001/11/03 21:59:20 dawes Exp $ */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
diff --git a/x11perf.h b/x11perf.h
index 394e5bd..a2fa075 100644
--- a/x11perf.h
+++ b/x11perf.h
@@ -23,6 +23,10 @@ SOFTWARE.
 ******************************************************************************/
 /* $XFree86: xc/programs/x11perf/x11perf.h,v 3.4 2001/07/25 15:05:16 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef VMS
 #include <X11/Xlib.h>
 #include <stdlib.h>