[cairo-commit] cairo-ocaml configure.ac, 1.11, 1.12 config.make.in, 1.3, 1.4 README, 1.1, 1.2 ChangeLog, 1.17, 1.18

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml
In directory gabe:/tmp/cvs-serv2640

Modified Files:
	configure.ac config.make.in README ChangeLog 
Log Message:
adapt to cairo big API shakeup


Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.ac	1 Mar 2005 22:19:52 -0000	1.11
+++ configure.ac	22 May 2005 20:03:15 -0000	1.12
@@ -5,7 +5,7 @@
 AC_PROG_OCAML()
 
 # Check for cairo
-PKG_CHECK_MODULES(CAIRO, cairo >= 0.3.0)
+PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
 
 # Optional GTK support (for the X11 backend)
 AC_ARG_WITH(gtk, 
@@ -24,19 +24,19 @@
   fi
 fi
 
-if test $use_gtk = yes ; then
-  # Check for gtkcairo
-  PKG_CHECK_MODULES(GTKCAIRO, gtkcairo, use_gtkcairo=yes, use_gtkcairo=no)
-else
-  use_gtkcairo=no
-fi
+dnl if test $use_gtk = yes ; then
+dnl  # Check for gtkcairo
+dnl  PKG_CHECK_MODULES(GTKCAIRO, gtkcairo, use_gtkcairo=yes, use_gtkcairo=no)
+dnl else
+dnl  use_gtkcairo=no
+dnl fi
 
 # Optional libsvg-cairo support
 PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
 
 echo
 echo "  GTK+         support: $use_gtk"
-echo "  GTKCairo     support: $use_gtkcairo"
+dnl echo "  GTKCairo     support: $use_gtkcairo"
 echo "  libsvg-cairo support: $use_libsvg_cairo"
 echo
 

Index: config.make.in
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/config.make.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.make.in	1 Mar 2005 22:19:52 -0000	1.3
+++ config.make.in	22 May 2005 20:03:15 -0000	1.4
@@ -20,8 +20,8 @@
 GDK_CFLAGS = @GDK_CFLAGS@
 GDK_LIBS   = $(filter-out $(FILT), at GDK_LIBS@)
 
-GTKCAIRO_CFLAGS = @GTKCAIRO_CFLAGS@
-GTKCAIRO_LIBS   = $(filter-out $(FILT), at GTKCAIRO_LIBS@)
+# GTKCAIRO_CFLAGS = @GTKCAIRO_CFLAGS@
+# GTKCAIRO_LIBS   = $(filter-out $(FILT), at GTKCAIRO_LIBS@)
 
 LIBSVG_CAIRO_CFLAGS = @LIBSVG_CAIRO_CFLAGS@
 LIBSVG_CAIRO_LIBS   = @LIBSVG_CAIRO_LIBS@

Index: README
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	2 Mar 2005 18:52:29 -0000	1.1
+++ README	22 May 2005 20:03:15 -0000	1.2
@@ -14,8 +14,8 @@
 Dependencies
 ============
 
- ocaml          3.08 (may work with 3.07 or even 3.06)
- cairo          0.3.0
+ ocaml          3.08
+ cairo          0.5.0
  libsvg-cairo   optional 0.1.5
  LablGTK        optional
 

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ChangeLog	9 Mar 2005 00:40:22 -0000	1.17
+++ ChangeLog	22 May 2005 20:03:15 -0000	1.18
@@ -1,3 +1,13 @@
+2005-05-22  Olivier Andrieu  <oliv__a at users.sourceforge.net>
+
+	* src/*: adjust to big API shakeup. Remove Cairo_channel module,
+	add Cairo_ps, Cairo_pdf, Cairo_png. GtkCairo and Cairo_ft disabled
+	for now.
+
+	* test/*: adjust to big API shakeup.
+
+	* configure.ac, README: require cairo 0.5.0
+
 2005-03-08  Olivier Andrieu  <oliv__a at users.sourceforge.net>
 
 	* src/ml_cairo_ft.c, src/cairo_ft.ml, src/cairo_ft.mli: