[Commit] Xrender Xrenderint.h,1.10,1.11 configure.ac,1.7,1.8
Keith Packard
commit@keithp.com
Mon, 05 May 2003 19:06:44 -0700
Committed by: keithp
Update of /local/src/CVS/Xrender
In directory home.keithp.com:/tmp/cvs-serv5515
Modified Files:
Xrenderint.h configure.ac
Log Message:
Remove bogus Xext.h include. Fix Render version comparison
Index: Xrenderint.h
===================================================================
RCS file: /local/src/CVS/Xrender/Xrenderint.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Xrenderint.h 26 Apr 2003 15:52:03 -0000 1.10
+++ Xrenderint.h 6 May 2003 02:06:41 -0000 1.11
@@ -30,7 +30,6 @@
#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
-#include <X11/extensions/Xext.h>
#include <X11/extensions/renderproto.h>
#include "Xrender.h"
Index: configure.ac
===================================================================
RCS file: /local/src/CVS/Xrender/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.ac 3 May 2003 20:00:16 -0000 1.7
+++ configure.ac 6 May 2003 02:06:41 -0000 1.8
@@ -47,7 +47,9 @@
fi
# Check render configuration
-PKG_CHECK_MODULES(RENDER, render >= $VERSION, [render_found_with_pkgconfig=yes],
+
+RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
+PKG_CHECK_MODULES(RENDER, render >= $RENDER_VERSION, [render_found_with_pkgconfig=yes],
[render_found_with_pkgconfig=no])
case "$render_found_with_pkgconfig" in
no)
@@ -59,7 +61,7 @@
AC_CHECK_HEADERS([X11/extensions/render.h X11/extensions/renderproto.h],
[], [AC_MSG_ERROR([Render headers not found.])])
AC_CHECK_TYPES([xAnimCursorElt], [],
- [AC_MSG_ERROR([Render headers too old. Version $VERSION or later is required.])],
+ [AC_MSG_ERROR([Render headers too old. Version $RENDER_VERSION or later is required.])],
[#include <X11/extensions/render.h>
#include <X11/extensions/renderproto.h>])