[cairo-commit] gtkcairo ChangeLog,1.12,1.13 configure.in,1.3,1.4

[OEyvind Kolaas]

Committed by: pippin

Update of /cvs/cairo/gtkcairo
In directory pdx:/tmp/cvs-serv17086

Modified Files:
	ChangeLog configure.in 
Log Message:
make gtkcairo compile without glitz installed


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/gtkcairo/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** a/ChangeLog	20 May 2004 18:41:16 -0000	1.12
--- b/ChangeLog	23 May 2004 22:30:21 -0000	1.13
***************
*** 1,2 ****
--- 1,7 ----
+ 2004-05-24  OEyvind Kolaas <oeyvindk at hig.no>
+ 
+ 	* configure.in: made glitz-glx usage autodetected
+ 	* gtkcairo/gdkcairo.[ch]: USE_GL define instead of CAIRO_HAS_...
+ 
  2004-05-20  OEyvind Kolaas <oeyvindk at hig.no>
  
***************
*** 74,76 ****
  	* Initial announcement.
  
- /* vim: set ts=4 noet : */
--- 79,80 ----

Index: configure.in
===================================================================
RCS file: /cvs/cairo/gtkcairo/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** a/configure.in	20 May 2004 00:19:12 -0000	1.3
--- b/configure.in	23 May 2004 22:30:21 -0000	1.4
***************
*** 40,45 ****
  
  dnl ===========================================================================
! 
! PKG_CHECK_MODULES(GTKCAIRO, gtk+-2.0 cairo >= 0.1.1 glitz-glx >= 0.1.3)
  AC_SUBST(GTKCAIRO_CFLAGS)
  AC_SUBST(GTKCAIRO_LIBS)
--- 40,44 ----
  
  dnl ===========================================================================
! PKG_CHECK_MODULES(GTKCAIRO, gtk+-2.0 cairo >= 0.1.1)
  AC_SUBST(GTKCAIRO_CFLAGS)
  AC_SUBST(GTKCAIRO_LIBS)
***************
*** 47,50 ****
--- 46,62 ----
  dnl ===========================================================================
  
+ AC_ARG_ENABLE(gl,
+                [  --disable-gl            Disable OpenGL support (glitz)],
+                [use_gl=$enableval],  [use_gl=yes])
+ 
+ if test "x$use_gl" = "xyes"; then
+   PKG_CHECK_MODULES(GL, glitz-glx >= 0.1, [
+   GTKCAIRO_CFLAGS="$GTKCAIRO_CFLAGS $GL_CFLAGS -DUSE_GL" 
+   GTKCAIRO_LIBS="$GTKCAIRO_LIBS $GL_LIBS"
+   use_gl=yes], [use_gl="no (requries glitz-glx)"])
+ fi
+ 
+ dnl ===========================================================================
+ 
  AC_OUTPUT([
  gtkcairo.pc