[Commit] Xrender Makefile.am,1.4,1.5 Xrenderint.h,1.7,1.8 configure.ac,1.4,1.5

commit@keithp.com commit@keithp.com
Mon, 21 Apr 2003 21:46:27 -0700


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

Modified Files:
	Makefile.am Xrenderint.h configure.ac 
Log Message:
Use local extutil.h if not installed on the system.


Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/Xrender/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	21 Apr 2003 16:47:36 -0000	1.4
+++ Makefile.am	22 Apr 2003 04:46:24 -0000	1.5
@@ -39,6 +39,7 @@
                         Xrender.c \
                         Xrender.h \
                         Xrenderint.h \
+                        extutil.h \
                         region.h
 
 libXrender_la_LIBADD = @X_LIBS@ -lXext -lX11

Index: Xrenderint.h
===================================================================
RCS file: /local/src/CVS/Xrender/Xrenderint.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Xrenderint.h	21 Apr 2003 17:22:42 -0000	1.7
+++ Xrenderint.h	22 Apr 2003 04:46:24 -0000	1.8
@@ -32,7 +32,11 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/renderproto.h>
-#include <X11/extensions/extutil.h>
+#if HAVE_X11_EXTENSIONS_EXTUTIL_H
+# include <X11/extensions/extutil.h>
+#else
+# include "extutil.h"  /* use local copy if not installed */
+#endif
 #include "Xrender.h"
 
 typedef struct {

Index: configure.ac
===================================================================
RCS file: /local/src/CVS/Xrender/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac	21 Apr 2003 17:36:39 -0000	1.4
+++ configure.ac	22 Apr 2003 04:46:25 -0000	1.5
@@ -46,6 +46,11 @@
         AC_MSG_ERROR([X is required, but it was either disabled or not found.])
 fi
 
+saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="-I$x_includes"
+AC_CHECK_HEADERS([X11/extensions/extutil.h], [], [], [#include <X11/Xutil.h>])
+CPPFLAGS="$saved_CPPFLAGS"
+
 # Check render configuration
 PKG_CHECK_MODULES(RENDER, render >= $VERSION, [render_found_with_pkgconfig=yes], 
                   [render_found_with_pkgconfig=no])