[cairo-commit] cairo-ocaml Makefile, 1.7, 1.8 README, 1.3, 1.4 config.make.in, 1.4, 1.5 configure.ac, 1.13, 1.14

[Olivier Andrieu]

Committed by: oandrieu

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

Modified Files:
	Makefile README config.make.in configure.ac 
Log Message:
* src/* : adapt to cairo-0.6.0

* Makefile, config.make.in, configure.ac: 
specify version number in the configure.ac file


Index: Makefile
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	9 Aug 2005 15:42:02 -0000	1.7
+++ Makefile	10 Aug 2005 23:45:14 -0000	1.8
@@ -3,7 +3,6 @@
 	$(MAKE) -C src $@
 
 
-VERSION = 0.5.2
 DISTSRC = aclocal.m4 config.make.in configure configure.ac Makefile Makefile.rules \
           doc support/install-sh support/ocaml.m4 \
           src/*.ml src/*.mli src/*.c src/*.h src/Makefile src/.depend_c \

Index: README
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	18 Jul 2005 19:11:05 -0000	1.3
+++ README	10 Aug 2005 23:45:14 -0000	1.4
@@ -10,12 +10,18 @@
  $ ./configure
  $ make
 
+configure will try to detect a LablGTK installation by scanning some
+directories (+lablgtk2 and +lablgtk). If LablGTK is installed
+elsewhere, specify the path with the LABLGTKDIR environment variable. 
+
+If you want to disable LablGTK support, run configure with
+--without-gtk option.
 
 Dependencies
 ============
 
  ocaml          3.08
- cairo          0.5.2
+ cairo          0.6.0
  libsvg-cairo   optional 0.1.5
  LablGTK        optional
 

Index: config.make.in
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/config.make.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.make.in	22 May 2005 20:03:15 -0000	1.4
+++ config.make.in	10 Aug 2005 23:45:14 -0000	1.5
@@ -1,4 +1,6 @@
 
+VERSION = @PACKAGE_VERSION@
+
 OCAMLC     = @OCAMLC@
 OCAMLOPT   = @OCAMLOPT@
 OCAMLMKLIB = @OCAMLMKLIB@

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- configure.ac	18 Jul 2005 19:11:05 -0000	1.13
+++ configure.ac	10 Aug 2005 23:45:14 -0000	1.14
@@ -1,11 +1,12 @@
-AC_INIT(src/cairo.ml)
+AC_INIT(CAIRO_OCAML, 0.6.0.0)
+AC_CONFIG_SRCDIR(src/cairo.ml)
 AC_CONFIG_AUX_DIR(support)
 
 # Check for OCaml programs 
 AC_PROG_OCAML()
 
 # Check for cairo
-PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.2)
+PKG_CHECK_MODULES(CAIRO, cairo >= 0.6.0)
 
 # Optional GTK support (for the X11 backend)
 AC_ARG_WITH(gtk,