[Commit] Xrender COPYING,NONE,1.1 ChangeLog,NONE,1.1 INSTALL,NONE,1.1 configure.ac,1.3,1.4

commit@keithp.com commit@keithp.com
Mon, 21 Apr 2003 10:36:42 -0700


Update of /local/src/CVS/Xrender
In directory home.keithp.com:/tmp/cvs-serv23484

Modified Files:
	configure.ac 
Added Files:
	COPYING ChangeLog INSTALL 
Log Message:
Fix render header version check to use VERSION, eliminate duplicate version numbers from configure.ac


--- NEW FILE: COPYING ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ChangeLog ---
2003-04-21	Keith Packard <keithp@keithp.com>

	+ Add ChangeLog and INSTALL

--- NEW FILE: INSTALL ---
Xrender is built with the traditional configure script:

	$ ./configure --prefix=/usr/X11R6

This should generate valid Makefiles, then:

        $ make
        $ make install

Index: configure.ac
===================================================================
RCS file: /local/src/CVS/Xrender/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	19 Apr 2003 18:21:06 -0000	1.3
+++ configure.ac	21 Apr 2003 17:36:39 -0000	1.4
@@ -25,14 +25,14 @@
 
 AC_PREREQ([2.50])
 
+AC_INIT(Xrender.h)
 dnl
 dnl Version should match the current Render version. XRenderQueryVersion
 dnl returns the version from render.h, NOT the version we set here. But we
 dnl try to keep these the same.
 dnl
-AC_INIT([xrender], [0.8])
-AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(xrender, 0.8)
+AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
@@ -47,7 +47,7 @@
 fi
 
 # Check render configuration
-PKG_CHECK_MODULES(RENDER, render >= 0.8, [render_found_with_pkgconfig=yes], 
+PKG_CHECK_MODULES(RENDER, render >= $VERSION, [render_found_with_pkgconfig=yes], 
                   [render_found_with_pkgconfig=no])
 case "$render_found_with_pkgconfig" in
 no)
@@ -59,7 +59,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 0.8 or later is required.])], 
+                       [AC_MSG_ERROR([Render headers too old. Version $VERSION or later is required.])], 
                        [#include <X11/extensions/render.h> 
                         #include <X11/extensions/renderproto.h>])