[cairo-commit] cairo-ocaml configure.ac, 1.7, 1.8 ChangeLog, 1.11, 1.12

[Olivier Andrieu]

Committed by: oandrieu

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

Modified Files:
	configure.ac ChangeLog 
Log Message:
* src/*.c: beautify code, run it through indent.

* src/ml_cairo.[ch]: direcly map enums to caml variants.

* configure.ac: do not fail if GTK+ is missing.

* test/spline.ml: do not use POINTER_MOTION_HINT, apparently that's evil.


Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.ac	15 Apr 2004 23:59:37 -0000	1.7
+++ configure.ac	28 Oct 2004 13:46:01 -0000	1.8
@@ -4,16 +4,36 @@
 # Check for OCaml programs 
 AC_PROG_OCAML()
 
-# Check for LablGTK
-AC_CHECK_OCAML_MODULE(lablgtk, LABLGTKDIR, Gobject, +lablgtk2 +lablgtk)
-
 # Check for cairo
 PKG_CHECK_MODULES(CAIRO, cairo >= 0.1.21)
 
-# Check for gdk-pixbuf
-PKG_CHECK_MODULES(GDK, cairo gdk-2.0 gdk-pixbuf-2.0)
+# Optional GTK support (for the X11 backend)
+AC_ARG_WITH(gtk, 
+	    AS_HELP_STRING([--with-gtk],[X11 backend support via GTK+ and LablGTK]),
+	    use_gtk=$withval, use_gtk=yes)
 
-# Check for gtkcairo
-PKG_CHECK_MODULES(GTKCAIRO, gtkcairo, : , : )
+if test $use_gtk = yes ; then
+  # Check for LablGTK
+  AC_CHECK_OCAML_MODULE(lablgtk, LABLGTKDIR, Gobject, +lablgtk2 +lablgtk)
+
+  if test "$LABLGTKDIR" ; then
+    # Check for gdk-pixbuf
+    PKG_CHECK_MODULES(GDK, cairo gdk-2.0 gdk-pixbuf-2.0, :, use_gtk=no)
+  else
+    use_gtk=no
+  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
+
+echo
+echo "  GTK+     support: $use_gtk"
+echo "  GTKCairo support: $use_gtkcairo"
+echo
 
 AC_OUTPUT(config.make)

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	18 Oct 2004 00:27:35 -0000	1.11
+++ ChangeLog	28 Oct 2004 13:46:01 -0000	1.12
@@ -1,8 +1,19 @@
+2004-10-28  Olivier Andrieu  <oliv__a at users.sourceforge.net>
+
+	* src/*.c: beautify code, run it through indent.
+
+	* src/ml_cairo.[ch]: direcly map enums to caml variants.
+
+	* configure.ac: do not fail if GTK+ is missing.
+
+	* test/spline.ml: do not use POINTER_MOTION_HINT, apparently
+	that's evil.
+	
 2004-10-18  Olivier Andrieu  <oliv__a at users.sourceforge.net>
 
 	* src/cairo.ml, src/cairo.mli: s/ct/cr/
 
-	* src/ml_cairo_wrappers.[ch]: add comparsion and hash function for
+	* src/ml_cairo_wrappers.[ch]: add comparison and hash function for
 	custom values.
 
 	* src/cairo.{ml,mli}, src/ml_cairo.[ch], src/ml_cairo_status.[ch]: