From a5962dda126e7e48f51c276f907a1fbb76b8ed4d Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Sun, 24 Oct 2004 21:03:56 +0000
Subject: Allow building without xrender.pc, by using AC_PATH_XTRA.  Bump to
 1.0.3.

---
 NEWS         |  4 ++++
 configure.ac | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 5743246..dd3dfed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2004-10-24:
+	Version 1.0.3 released.
+	Allows building on systems without xrender.pc
+
 2004-09-19:
 	Version 1.0.2 released.
 	Adds a transformed coordinates test.
diff --git a/configure.ac b/configure.ac
index 510b31b..a76131f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([rendercheck],
-        1.0.2,
+        1.0.3,
         [anholt@FreeBSD.org],
         rendercheck)
 
@@ -18,7 +18,22 @@ AM_MAINTAINER_MODE
 AC_PROG_CC
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(RC, xrender)
+PKG_CHECK_MODULES(RC, xrender,
+		  [xrender_found_with_pkgconfig=yes],
+		  [xrender_found_with_pkgconfig=no])
+
+if test "$xrender_found_with_pkgconfig" = "no"
+then
+	AC_PATH_XTRA
+	if test "x$no_x" = "xyes"
+	then
+		AC_MSG_ERROR([X is required, but it was either disabled or not found.])
+	fi
+
+	RC_CFLAGS="$X_CFLAGS"
+	RC_LIBS="$X_LIBS -lXrender -lXext -lX11"
+fi
+
 AC_SUBST(RC_CFLAGS)
 AC_SUBST(RC_LIBS)
 
-- 
cgit v1.2.3