Page MenuHomeFreeBSD
Files F110685515

D2434.id5164.diff
No OneTemporary
Actions

D2434.id5164.diff
View Options

Index: Mk/bsd.ocaml.mk
===================================================================
--- Mk/bsd.ocaml.mk
+++ Mk/bsd.ocaml.mk
@@ -17,6 +17,10 @@
# USE_OCAML_FINDLIB - Set if your port uses ocamlfind to install
# packages. Package direcories will be
# automatically deleted.
+# USE_OCAML_CAMLP4 - Set if your port uses camlp4 to build.
+# USE_OCAML_TK - Set if you port needs ocaml-labltk.
+# NO_OCAMLTK_BUILDDEPENDS - Don't add labltk to BUILD|EXTRACT|PATCH_DEPENDS.
+# NO_OCAMLTK_RUNDEPENDS - Don't add labltk to RUN_DEPENDS.
# USE_OCAML_LDCONFIG - Set if your port installs shared libraries
# into ocaml site-lib dir. OCaml ld.conf file
# will be automatically processed.
@@ -44,6 +48,8 @@
OCAMLC_OPT?= ${LOCALBASE}/bin/ocamlc.opt
OCAMLCP?= ${LOCALBASE}/bin/ocamlcp
OCAMLFIND?= ${LOCALBASE}/bin/ocamlfind
+CAMLP4?= ${LOCALBASE}/bin/camlp4
+OCAMLTK?= ${LOCALBASE}/bin/labltk
#
# OCaml library directory
@@ -68,6 +74,18 @@
OCAMLFIND_DEPEND?= ${OCAMLFIND}:${OCAMLFIND_PORT}
#
+# OCaml camlp4 port dependency
+#
+CAMLP4_PORT?= ${PORTSDIR}/devel/ocaml-camlp4
+CAMLP4_DEPEND?= ${CAMLP4}:${CAMLP4_PORT}
+
+#
+# OCaml TK bindings dependency
+#
+OCAMLTK_PORT?= ${PORTSDIR}/x11-toolkits/ocaml-labltk
+OCAMLTK_DEPENDS?= ${OCAMLTK}:${OCAMLTK_PORT}
+
+#
# Common OCaml examples and documents location
#
OCAML_DOCSDIR= ${PREFIX}/share/doc/ocaml
@@ -136,6 +154,21 @@
. endif
.endif
+.if defined(USE_OCAML_CAMLP4)
+BUILD_DEPENDS+= ${CAMLP4_DEPEND}
+.endif
+
+.if defined(USE_OCAML_TK)
+. if !defined(NO_OCAMLTK_BUILDDEPENDS)
+EXTRACT_DEPENDS+= ${OCAMLTK_DEPENDS}
+PATCH_DEPENDS+= ${OCAMLTK_DEPENDS}
+BUILD_DEPENDS+= ${OCAMLTK_DEPENDS}
+. endif
+. if !defined(NO_OCAMLTK_RUNDEPENDS)
+RUN_DEPENDS+= ${OCAMLTK_DEPENDS}
+. endif
+.endif
+
.if defined(USE_OCAML_LDCONFIG)
#
# Directories under PREFIX for appending to ld.conf
Index: astro/planets/Makefile
===================================================================
--- astro/planets/Makefile
+++ astro/planets/Makefile
@@ -15,6 +15,8 @@
USES= gmake tar:tgz
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
+USE_OCAML_TK= yes
USE_XORG= x11
ALL_TARGET= ${PORTNAME}
Index: databases/ocaml-mysql/Makefile
===================================================================
--- databases/ocaml-mysql/Makefile
+++ databases/ocaml-mysql/Makefile
@@ -15,6 +15,7 @@
USE_MYSQL= yes
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
Index: deskutils/wyrd/Makefile
===================================================================
--- deskutils/wyrd/Makefile
+++ deskutils/wyrd/Makefile
@@ -12,11 +12,11 @@
LICENSE= GPLv2
-BUILD_DEPENDS= camlp4o:${PORTSDIR}/devel/ocaml-camlp4
RUN_DEPENDS= remind:${PORTSDIR}/deskutils/remind
USES= gmake ncurses
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
PLIST_FILES= bin/wyrd etc/wyrdrc man/man1/wyrd.1.gz man/man5/wyrdrc.5.gz
Index: devel/coccinelle/Makefile
===================================================================
--- devel/coccinelle/Makefile
+++ devel/coccinelle/Makefile
@@ -17,6 +17,7 @@
GNU_CONFIGURE= yes
USE_PERL5= build
USE_OCAML= 3.0+
+USE_OCAML_CAMLP4=yes
MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER}
CONFIGURE_ENV+= PYVER=${PYTHON_VER} PYTHON=${PYTHON_CMD}
Index: devel/ocaml-camomile/Makefile
===================================================================
--- devel/ocaml-camomile/Makefile
+++ devel/ocaml-camomile/Makefile
@@ -15,6 +15,7 @@
USES= gmake tar:bzip2
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
+USE_OCAML_CAMLP4=yes
USE_OCAML_LDCONFIG=yes
USE_OCAML_WASH= yes
GNU_CONFIGURE= yes
Index: devel/ocaml-deriving-ocsigen/Makefile
===================================================================
--- devel/ocaml-deriving-ocsigen/Makefile
+++ devel/ocaml-deriving-ocsigen/Makefile
@@ -12,6 +12,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
Index: devel/ocaml-extlib/Makefile
===================================================================
--- devel/ocaml-extlib/Makefile
+++ devel/ocaml-extlib/Makefile
@@ -17,6 +17,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
+USE_OCAML_CAMLP4=yes
USE_OCAMLFIND_PLIST=yes
USES= gmake
Index: devel/ocaml-typeconv/Makefile
===================================================================
--- devel/ocaml-typeconv/Makefile
+++ devel/ocaml-typeconv/Makefile
@@ -17,6 +17,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
+USE_OCAML_CAMLP4=yes
USE_OCAMLFIND_PLIST=yes
OCAML_PKGDIRS= ${PORTNAME:S,-,_,}
Index: devel/ocaml-ulex/Makefile
===================================================================
--- devel/ocaml-ulex/Makefile
+++ devel/ocaml-ulex/Makefile
@@ -11,11 +11,10 @@
MAINTAINER= johans@FreeBSD.org
COMMENT= Lexer generator for Unicode and OCaml
-BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4
-
USES= gmake
USE_OCAML= true
USE_OCAML_FINDLIB= true
+USE_OCAML_CAMLP4= true
USE_OCAML_LDCONFIG= true
USE_OCAMLFIND_PLIST= yes
Index: devel/ocaml-xstrp4/Makefile
===================================================================
--- devel/ocaml-xstrp4/Makefile
+++ devel/ocaml-xstrp4/Makefile
@@ -18,6 +18,7 @@
USES= gmake
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
Index: graphics/ocaml-lablgl/Makefile
===================================================================
--- graphics/ocaml-lablgl/Makefile
+++ graphics/ocaml-lablgl/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= lablgl
-PORTVERSION= 20120306
-PORTREVISION= 3
+PORTVERSION= 1.05
+PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
https://forge.ocamlcore.org/frs/download.php/816/
@@ -14,7 +14,7 @@
LICENSE= BSD3CLAUSE
-CONFLICTS= ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
+CONFLICTS= ocaml-nox11-[0-9]*
USES= gmake tk:84,85
USE_XORG= x11 xext xmu
@@ -21,9 +21,10 @@
USE_GL= glut
USE_OCAML= yes
USE_OCAML_WASH= yes
+USE_OCAML_CAMLP4=yes
+USE_OCAML_TK= yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE= yes
-WRKSRC= ${WRKDIR}/lablGL
DOCSDIR= ${PREFIX}/share/doc/ocaml/lablgl
EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/lablgl
Index: graphics/ocaml-lablgl/distinfo
===================================================================
--- graphics/ocaml-lablgl/distinfo
+++ graphics/ocaml-lablgl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lablgl-20120306.tar.gz) = 39017555724ca67807e73543b9fca1fcf9aab285f723635c9eee4034ac88adf0
-SIZE (lablgl-20120306.tar.gz) = 423411
+SHA256 (lablgl-1.05.tar.gz) = d8ff03e35b970d2b23a942f9e6ed65da5a6c123986bd0ecf5424a6205af34b61
+SIZE (lablgl-1.05.tar.gz) = 296597
Index: graphics/ocaml-lablgl/pkg-descr
===================================================================
--- graphics/ocaml-lablgl/pkg-descr
+++ graphics/ocaml-lablgl/pkg-descr
@@ -9,4 +9,4 @@
Please see ${PREFIX}/share/doc/ocaml/lablgl/README for further information.
-WWW: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html
+WWW: https://forge.ocamlcore.org/projects/lablgl/
Index: graphics/ocaml-lablgl/pkg-plist
===================================================================
--- graphics/ocaml-lablgl/pkg-plist
+++ graphics/ocaml-lablgl/pkg-plist
@@ -106,8 +106,6 @@
%%EXAMPLESDIR%%/lablglut/caml-images/OCamlMakefile
%%EXAMPLESDIR%%/lablglut/caml-images/main.ml
%%EXAMPLESDIR%%/lablglut/caml-images/ppm.ppm
-%%EXAMPLESDIR%%/lablglut/etc/draw2d.ml
-%%EXAMPLESDIR%%/lablglut/etc/in-progress/scene_graph.ml
%%EXAMPLESDIR%%/lablglut/lablGL/README
%%EXAMPLESDIR%%/lablglut/lablGL/checker.ml
%%EXAMPLESDIR%%/lablglut/lablGL/gears.ml
Index: math/ocamlgsl/Makefile
===================================================================
--- math/ocamlgsl/Makefile
+++ math/ocamlgsl/Makefile
@@ -21,6 +21,7 @@
USES= gmake
USE_OCAML= YES
USE_OCAML_FINDLIB= YES
+USE_OCAML_CAMLP4= YES
USE_OCAML_LDCONFIG= YES
OCAML_PKGDIRS= gsl
HAS_CONFIGURE= YES
Index: math/orpie/Makefile
===================================================================
--- math/orpie/Makefile
+++ math/orpie/Makefile
@@ -16,6 +16,7 @@
USES= gmake
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
Index: net-p2p/liberator/Makefile
===================================================================
--- net-p2p/liberator/Makefile
+++ net-p2p/liberator/Makefile
@@ -13,6 +13,7 @@
USES= tar:bzip2
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE=yes
Index: net-p2p/mldonkey/Makefile
===================================================================
--- net-p2p/mldonkey/Makefile
+++ net-p2p/mldonkey/Makefile
@@ -12,12 +12,12 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/Copying.txt
-BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
-
CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]*
USES= iconv tar:bzip2 gmake
USE_AUTOTOOLS= autoconf:env
+USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
ALL_TARGET= opt
MAKE_ENV+= OCAMLRUNPARAM="l=256M"
Index: security/sks/Makefile
===================================================================
--- security/sks/Makefile
+++ security/sks/Makefile
@@ -9,11 +9,10 @@
MAINTAINER= johans@FreeBSD.org
COMMENT= Synchronizing Key Server, a fast OpenPGP keyserver
-BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4
-
PROJECTHOST= sks-keyserver
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
USE_BDB= 5
USES= perl5 gmake shebangfix tar:tgz
USE_PERL5= build
Index: textproc/ocaml-text/Makefile
===================================================================
--- textproc/ocaml-text/Makefile
+++ textproc/ocaml-text/Makefile
@@ -19,6 +19,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAMLFIND_PLIST= yes
Index: www/ocaml-net/Makefile
===================================================================
--- www/ocaml-net/Makefile
+++ www/ocaml-net/Makefile
@@ -21,6 +21,7 @@
USES= gmake
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAMLFIND_PLIST= yes
HAS_CONFIGURE= yes
Index: x11-toolkits/ocaml-lablgtk2/Makefile
===================================================================
--- x11-toolkits/ocaml-lablgtk2/Makefile
+++ x11-toolkits/ocaml-lablgtk2/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lablgtk2
-PORTVERSION= 2.16.0
-PORTREVISION= 2
+PORTVERSION= 2.18.3
CATEGORIES= x11-toolkits
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/979/ \
LOCAL/bf
@@ -20,8 +19,10 @@
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAMLFIND_PLIST= yes
+USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAML_WASH= yes
+USE_OCAML_CAMLP4= yes
OPTIONS_DEFINE= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \
GTKSPELL LIBRSVG2 DOCS EXAMPLES
@@ -38,6 +39,7 @@
HAS_CONFIGURE= yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE= yes
+WRKSRC= ${WRKDIR}/lablgtk-2.16.0
CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \
--without-gtksourceview
Index: x11-toolkits/ocaml-lablgtk2/distinfo
===================================================================
--- x11-toolkits/ocaml-lablgtk2/distinfo
+++ x11-toolkits/ocaml-lablgtk2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lablgtk-2.16.0.tar.gz) = a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f
-SIZE (lablgtk-2.16.0.tar.gz) = 787217
+SHA256 (lablgtk-2.18.3.tar.gz) = a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f
+SIZE (lablgtk-2.18.3.tar.gz) = 787217
Index: x11-toolkits/ocaml-lablgtk2/files/patch-20130219
===================================================================
--- x11-toolkits/ocaml-lablgtk2/files/patch-20130219
+++ x11-toolkits/ocaml-lablgtk2/files/patch-20130219
@@ -1,1744 +0,0 @@
-diff --git CHANGES CHANGES
-index 33e393d..33c3e8b 100644
---- CHANGES
-+++ CHANGES
-@@ -1,5 +1,17 @@
- LablGTK changes log
-
-+2013.2.19 [Jacques]
-+ * fix compatibility with ocaml 4.01 (?lab for non-optional arguments)
-+
-+2012.08.26 [Jacques]
-+ * detect findlib during configuration
-+ * support DESTDIR with findlib-install
-+
-+2012.08.26 [Jacques]
-+ * indicate that only old-install supports DESTDIR
-+ * have old-install copy the META file too
-+ * cleanup the two phases of findlib-install
-+
- In Lablgtk-2.16.0:
-
- 2012.08.23 [Jacques]
-diff --git README README
-index a31230c..6c2719a 100755
---- README
-+++ README
-@@ -67,10 +67,9 @@ How to compile:
- override autodetected gtksourceview2 support
- --enable-debug: enable debug mode
-
-- Type "make install" or "make install DESTDIR=..." to install using
-- findlib. The commands lablgtk2, gdk_pixbuf_mlsource, and
-- lablgladecc2, are copied directly to the configured executable
-- directory. Installation paths are prefixed by DESTDIR when given.
-+ Type "make install" to install using findlib.
-+ The commands lablgtk2, gdk_pixbuf_mlsource, and lablgladecc2,
-+ are copied directly to the configured executable directory.
-
- The following findlib packages are provided (according to configuration):
-
-@@ -87,10 +86,11 @@ How to compile:
- lablgtk2.sourceview
- lablgtk2.sourceview2
-
-- You can alternatively use "make old-install" to use the old
-+ You can alternatively use "make old-install" or
-+ "make old-install DESTDIR=/my/prefix" to use the old
- installation procedure, which does not rely on findlib.
- By default, the library is installed at +lablgtk2.
-- Again, installation paths are prefixed by DESTDIR when given.
-+ All installation paths are prefixed by DESTDIR when given.
-
- Contents:
-
-diff --git config.make.in config.make.in
-index e689bda..14d3cdd 100644
---- config.make.in
-+++ config.make.in
-@@ -9,6 +9,9 @@ OCAMLDOC=@OCAMLDOC@
- CAMLMKTOP=@CAMLMKTOP@
- CAMLMKLIB=@CAMLMKLIB@
- CAMLP4O=@CAMLP4O@
-+OCAMLFIND=@OCAMLFIND@
-+FINDLIBDIR=@FINDLIBDIR@
-+OCAMLLDCONF=@OCAMLLDCONF@
- CAMLBEST=@OCAMLBEST@
- CAMLWIN32=@OCAMLWIN32@
- CAMLDEP=@OCAMLDEP@
-@@ -56,9 +59,11 @@ BINDIR=$(DESTDIR)@bindir@
- # where to install the man page
- MANDIR=$(DESTDIR)@mandir@
-
-+LABLGTKDIR=@LIBDIR@/lablgtk2
- INSTALLDIR=$(DESTDIR)@LIBDIR@/lablgtk2
- DLLDIR=$(DESTDIR)@LIBDIR@/stublibs
- LABLGLDIR=@LABLGLDIR@
-+FLINSTALLDIR=$(DESTDIR)$(FINDLIBDIR)/lablgtk2
-
- FILT = -Wl,--export-dynamic
- clean_libs = $(subst -pthread,-ldopt -pthread -ccopt -pthread,$(subst --rpath,-rpath,$(filter-out $(FILT),$(1))))
-diff --git configure configure
-index 44a943b..8cdc264 100755
---- configure
-+++ configure
-@@ -1,11 +1,9 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68.
-+# Generated by GNU Autoconf 2.69.
- #
- #
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -134,6 +132,31 @@ export LANGUAGE
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-+# Use a proper internal environment variable to ensure we don't fall
-+ # into an infinite loop, continuously re-executing ourselves.
-+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-+ _as_can_reexec=no; export _as_can_reexec;
-+ # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+as_fn_exit 255
-+ fi
-+ # We don't want this to propagate to other subprocesses.
-+ { _as_can_reexec=; unset _as_can_reexec;}
- if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
-@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
- else
- exitcode=1; echo positional parameters were not saved.
- fi
--test x\$exitcode = x0 || exit 1"
-+test x\$exitcode = x0 || exit 1
-+test -x / || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-@@ -211,21 +235,25 @@ IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
-- # We cannot yet assume a decent shell, so we have to provide a
-- # neutralization value for shells without unset; and this also
-- # works around shells that cannot unset nonexistent variables.
-- # Preserve -v and -x to the replacement shell.
-- BASH_ENV=/dev/null
-- ENV=/dev/null
-- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-- export CONFIG_SHELL
-- case $- in # ((((
-- *v*x* | *x*v* ) as_opts=-vx ;;
-- *v* ) as_opts=-v ;;
-- *x* ) as_opts=-x ;;
-- * ) as_opts= ;;
-- esac
-- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-+ export CONFIG_SHELL
-+ # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+exit 255
- fi
-
- if test x$as_have_required = xno; then :
-@@ -327,6 +355,14 @@ $as_echo X"$as_dir" |
-
-
- } # as_fn_mkdir_p
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+ test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
- # as_fn_append VAR VALUE
- # ----------------------
- # Append the text in VALUE to the end of the definition contained in VAR. Take
-@@ -448,6 +484,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+ # already done that, so ensure we don't try to do so again and fall
-+ # in an infinite loop. This has already happened in practice.
-+ _as_can_reexec=no; export _as_can_reexec
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
-@@ -482,16 +522,16 @@ if (echo >conf$$.file) 2>/dev/null; then
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-+ # In both cases, we have to default to `cp -pR'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -503,28 +543,8 @@ else
- as_mkdir_p=false
- fi
-
--if test -x / >/dev/null 2>&1; then
-- as_test_x='test -x'
--else
-- if ls -dL / >/dev/null 2>&1; then
-- as_ls_L_option=L
-- else
-- as_ls_L_option=
-- fi
-- as_test_x='
-- eval sh -c '\''
-- if test -d "$1"; then
-- test -d "$1/.";
-- else
-- case $1 in #(
-- -*)set "./$1";;
-- esac;
-- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-- ???[sx]*):;;*)false;;esac;fi
-- '\'' sh
-- '
--fi
--as_executable_p=$as_test_x
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -568,6 +588,8 @@ DEBUG
- USE_CC
- HAVE_SVGZ
- LABLGLDIR
-+OCAMLLDCONF
-+FINDLIBDIR
- HAS_NATIVE_DYNLINK
- HAS_DLL_SUPPORT
- THREADS_LIB
-@@ -623,6 +645,7 @@ CC
- RANLIB
- HAS_PRINTEXC_BACKTRACE
- ODOC_DEF
-+OCAMLFIND
- CAMLP4O
- CAMLMKLIB
- CAMLMKTOP
-@@ -1179,8 +1202,6 @@ target=$target_alias
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
-- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-@@ -1471,9 +1492,9 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.68
-+generated by GNU Autoconf 2.69
-
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1591,7 +1612,7 @@ $as_echo "$ac_try_echo"; } >&5
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-+ test -x conftest$ac_exeext
- }; then :
- ac_retval=0
- else
-@@ -1681,7 +1702,7 @@ This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.68. Invocation command line was
-+generated by GNU Autoconf 2.69. Invocation command line was
-
- $ $0 $@
-
-@@ -2048,7 +2069,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CAMLC="ocamlc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2116,7 +2137,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CAMLOPT="ocamlopt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2174,7 +2195,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLCDOTOPT="ocamlc.opt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2228,7 +2249,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLOPTDOTOPT="ocamlopt.opt"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2282,7 +2303,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLRUN="ocamlrun"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2324,7 +2345,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLDEP="ocamldep"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2366,7 +2387,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLDOC="ocamldoc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2409,7 +2430,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLLEX="ocamllex"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2456,7 +2477,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OCAMLYACC="ocamlyacc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2498,7 +2519,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CAMLMKTOP="ocamlmktop"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2540,7 +2561,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CAMLMKLIB="ocamlmklib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2582,7 +2603,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CAMLP4O="camlp4o"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2608,6 +2629,60 @@ if test "$CAMLP4O" = no ; then
- as_fn_error $? "Cannot find camlp4o." "$LINENO" 5
- fi
-
-+# Extract the first word of "ocamlfind", so it can be a program name with args.
-+set dummy ocamlfind; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_OCAMLFIND+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$OCAMLFIND"; then
-+ ac_cv_prog_OCAMLFIND="$OCAMLFIND" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_OCAMLFIND="ocamlfind"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_prog_OCAMLFIND" && ac_cv_prog_OCAMLFIND="no"
-+fi
-+fi
-+OCAMLFIND=$ac_cv_prog_OCAMLFIND
-+if test -n "$OCAMLFIND"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCAMLFIND" >&5
-+$as_echo "$OCAMLFIND" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+if test "`$OCAMLFIND printconf stdlib`" != "`$CAMLC -where`"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ocamlfind" >&5
-+$as_echo "$as_me: WARNING: Ignoring ocamlfind" >&2;}
-+ OCAMLFIND=no
-+fi
-+
-+if test "$OCAMLFIND" = no; then
-+FINDLIBDIR=""
-+OCAMLLDCONF=""
-+else
-+FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`"
-+echo "$OCAMLFIND library path is $FINDLIBDIR"
-+OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`"
-+echo "$OCAMLFIND ldconf path is $OCAMLLDCONF"
-+fi
-+
- if expr "$OCAMLVERSION" '>=' '4' > /dev/null ; then
- ODOC_DEF="-D OCAML_400"
- fi
-@@ -2673,7 +2748,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2713,7 +2788,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2776,7 +2851,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2816,7 +2891,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2869,7 +2944,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2910,7 +2985,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -2968,7 +3043,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3012,7 +3087,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3458,8 +3533,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+struct stat;
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
-@@ -3615,7 +3689,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3867,7 +3941,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3910,7 +3984,7 @@ do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5126,6 +5200,9 @@ fi
-
-
-
-+
-+
-+
- # Finally create the config.make from config.make.in
- ac_config_files="$ac_config_files config.make"
-
-@@ -5572,16 +5649,16 @@ if (echo >conf$$.file) 2>/dev/null; then
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-+ # In both cases, we have to default to `cp -pR'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -5641,28 +5718,16 @@ else
- as_mkdir_p=false
- fi
-
--if test -x / >/dev/null 2>&1; then
-- as_test_x='test -x'
--else
-- if ls -dL / >/dev/null 2>&1; then
-- as_ls_L_option=L
-- else
-- as_ls_L_option=
-- fi
-- as_test_x='
-- eval sh -c '\''
-- if test -d "$1"; then
-- test -d "$1/.";
-- else
-- case $1 in #(
-- -*)set "./$1";;
-- esac;
-- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-- ???[sx]*):;;*)false;;esac;fi
-- '\'' sh
-- '
--fi
--as_executable_p=$as_test_x
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+ test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5684,7 +5749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # values after options handling.
- ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.68. Invocation command line was
-+generated by GNU Autoconf 2.69. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -5737,10 +5802,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.68,
-+configured by $0, generated by GNU Autoconf 2.69,
- with options \\"\$ac_cs_config\\"
-
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
-@@ -5817,7 +5882,7 @@ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
-- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
-diff --git configure.in configure.in
-index ae12f7e..eec0913 100644
---- configure.in
-+++ configure.in
-@@ -154,6 +154,22 @@ if test "$CAMLP4O" = no ; then
- AC_MSG_ERROR(Cannot find camlp4o.)
- fi
-
-+AC_CHECK_PROG(OCAMLFIND,ocamlfind,ocamlfind,no)
-+if test "`$OCAMLFIND printconf stdlib`" != "`$CAMLC -where`"; then
-+ AC_MSG_WARN(Ignoring ocamlfind, it uses a different OCaml installation.)
-+ OCAMLFIND=no
-+fi
-+
-+if test "$OCAMLFIND" = no; then
-+FINDLIBDIR=""
-+OCAMLLDCONF=""
-+else
-+FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`"
-+echo "$OCAMLFIND library path is $FINDLIBDIR"
-+OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`"
-+echo "$OCAMLFIND ldconf path is $OCAMLLDCONF"
-+fi
-+
- if expr "$OCAMLVERSION" '>=' '4' > /dev/null ; then
- ODOC_DEF="-D OCAML_400"
- fi
-@@ -351,6 +367,9 @@ AC_SUBST(OCAMLDOC)
- AC_SUBST(CAMLMKTOP)
- AC_SUBST(CAMLMKLIB)
- AC_SUBST(CAMLP4O)
-+AC_SUBST(OCAMLFIND)
-+AC_SUBST(FINDLIBDIR)
-+AC_SUBST(OCAMLLDCONF)
- AC_SUBST(LABLGLDIR)
- AC_SUBST(HAVE_SVGZ)
- AC_SUBST(USE_CC)
-diff --git src/.depend src/.depend
-index 873af00..0423dea 100644
---- src/.depend
-+++ src/.depend
-@@ -1,441 +1,542 @@
--gaux.cmo:
--gaux.cmx:
--gpointer.cmo: gpointer.cmi
--gpointer.cmx: gpointer.cmi
--gutf8.cmo: gutf8.cmi
--gutf8.cmx: gutf8.cmi
--glib.cmo: gutf8.cmi glib.cmi
--glib.cmx: gutf8.cmx glib.cmi
--gobject.cmo: gpointer.cmi gaux.cmo gobject.cmi
--gobject.cmx: gpointer.cmx gaux.cmx gobject.cmi
--gdkEnums.cmo: gpointer.cmi gobject.cmi
--gdkEnums.cmx: gpointer.cmx gobject.cmx
--pangoEnums.cmo: gpointer.cmi gobject.cmi
--pangoEnums.cmx: gpointer.cmx gobject.cmx
--gtkEnums.cmo: gpointer.cmi gobject.cmi
--gtkEnums.cmx: gpointer.cmx gobject.cmx
--pango.cmo: gpointer.cmi gobject.cmi glib.cmi gaux.cmo
--pango.cmx: gpointer.cmx gobject.cmx glib.cmx gaux.cmx
--gdk.cmo: pango.cmo gpointer.cmi gobject.cmi gaux.cmo gdk.cmi
--gdk.cmx: pango.cmx gpointer.cmx gobject.cmx gaux.cmx gdk.cmi
--gdkEvent.cmo: gpointer.cmi gdk.cmi gaux.cmo
--gdkEvent.cmx: gpointer.cmx gdk.cmx gaux.cmx
--gdkKeysyms.cmo: gdk.cmi
--gdkKeysyms.cmx: gdk.cmx
--gdkPixbuf.cmo: gpointer.cmi gobject.cmi gdk.cmi gaux.cmo gdkPixbuf.cmi
--gdkPixbuf.cmx: gpointer.cmx gobject.cmx gdk.cmx gaux.cmx gdkPixbuf.cmi
--gtk.cmo: gpointer.cmi gobject.cmi
--gtk.cmx: gpointer.cmx gobject.cmx
--gtkSignal.cmo: gobject.cmi gtkSignal.cmi
--gtkSignal.cmx: gobject.cmx gtkSignal.cmi
--gtkStock.cmo: gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo
--gtkStock.cmx: gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx
--gtkObject.cmo: gtk.cmo gobject.cmi
--gtkObject.cmx: gtk.cmx gobject.cmx
--gtkData.cmo: gtkSignal.cmi gtkBaseProps.cmo gtk.cmo gobject.cmi gdk.cmi \
-+gaux.cmo :
-+gaux.cmx :
-+gpointer.cmo : gpointer.cmi
-+gpointer.cmx : gpointer.cmi
-+gutf8.cmo : gutf8.cmi
-+gutf8.cmx : gutf8.cmi
-+glib.cmo : gutf8.cmi glib.cmi
-+glib.cmx : gutf8.cmx glib.cmi
-+gobject.cmo : gpointer.cmi gaux.cmo gobject.cmi
-+gobject.cmx : gpointer.cmx gaux.cmx gobject.cmi
-+gdkEnums.cmo : gpointer.cmi gobject.cmi
-+gdkEnums.cmx : gpointer.cmx gobject.cmx
-+pangoEnums.cmo : gpointer.cmi gobject.cmi
-+pangoEnums.cmx : gpointer.cmx gobject.cmx
-+gtkEnums.cmo : gpointer.cmi gobject.cmi
-+gtkEnums.cmx : gpointer.cmx gobject.cmx
-+pango.cmo : gpointer.cmi gobject.cmi glib.cmi gaux.cmo
-+pango.cmx : gpointer.cmx gobject.cmx glib.cmx gaux.cmx
-+gdk.cmo : pango.cmo gpointer.cmi gobject.cmi gaux.cmo gdk.cmi
-+gdk.cmx : pango.cmx gpointer.cmx gobject.cmx gaux.cmx gdk.cmi
-+gdkEvent.cmo : gpointer.cmi gdk.cmi gaux.cmo
-+gdkEvent.cmx : gpointer.cmx gdk.cmx gaux.cmx
-+gdkKeysyms.cmo : gdk.cmi
-+gdkKeysyms.cmx : gdk.cmx
-+gdkPixbuf.cmo : gpointer.cmi gobject.cmi gdk.cmi gaux.cmo gdkPixbuf.cmi
-+gdkPixbuf.cmx : gpointer.cmx gobject.cmx gdk.cmx gaux.cmx gdkPixbuf.cmi
-+gtk.cmo : gpointer.cmi gobject.cmi
-+gtk.cmx : gpointer.cmx gobject.cmx
-+gtkSignal.cmo : gobject.cmi gtkSignal.cmi
-+gtkSignal.cmx : gobject.cmx gtkSignal.cmi
-+gtkStock.cmo : gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo
-+gtkStock.cmx : gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx
-+gtkObject.cmo : gtk.cmo gobject.cmi
-+gtkObject.cmx : gtk.cmx gobject.cmx
-+gtkBaseProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gpointer.cmi gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi
-+gtkBaseProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gpointer.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx
-+gtkBinProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi gdk.cmi
-+gtkBinProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx gdk.cmx
-+gtkButtonProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-+ gtk.cmo gobject.cmi gdk.cmi
-+gtkButtonProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-+ gtk.cmx gobject.cmx gdk.cmx
-+gtkEditProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi
-+gtkEditProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx
-+gtkListProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi gdkEvent.cmo
-+gtkListProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx gdkEvent.cmx
-+gtkMenuProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi
-+gtkMenuProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx
-+gtkMiscProps.cmo : pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \
-+ gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi
-+gtkMiscProps.cmx : pangoEnums.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \
-+ gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx
-+gtkPackProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi gdk.cmi
-+gtkPackProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx gdk.cmx
-+gtkRangeProps.cmo : pangoEnums.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-+ gtk.cmo gobject.cmi
-+gtkRangeProps.cmx : pangoEnums.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-+ gtk.cmx gobject.cmx
-+gtkTextProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \
-+ gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi
-+gtkTextProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \
-+ gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx
-+gtkTreeProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \
-+ gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi
-+gtkTreeProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \
-+ gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx
-+gtkFileProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi
-+gtkFileProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx
-+gtkActionProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-+ gtk.cmo gobject.cmi
-+gtkActionProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-+ gtk.cmx gobject.cmx
-+gtkBrokenProps.cmo : gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi
-+gtkBrokenProps.cmx : gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx
-+gtkAssistantProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi gdkPixbuf.cmi
-+gtkAssistantProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx gdkPixbuf.cmx
-+gtkData.cmo : gtkSignal.cmi gtkBaseProps.cmo gtk.cmo gobject.cmi gdk.cmi \
- gaux.cmo
--gtkData.cmx: gtkSignal.cmx gtkBaseProps.cmx gtk.cmx gobject.cmx gdk.cmx \
-+gtkData.cmx : gtkSignal.cmx gtkBaseProps.cmx gtk.cmx gobject.cmx gdk.cmx \
- gaux.cmx
--gtkBase.cmo: pango.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-- gtkBaseProps.cmo gtk.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi \
-- gdkEvent.cmo gdk.cmi gaux.cmo
--gtkBase.cmx: pango.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-- gtkBaseProps.cmx gtk.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx \
-- gdkEvent.cmx gdk.cmx gaux.cmx
--gtkPack.cmo: gtkPackProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo
--gtkPack.cmx: gtkPackProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx
--gtkButton.cmo: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtkButtonProps.cmo \
-+gtkBase.cmo : pango.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \
-+ gtkEnums.cmo gtkBaseProps.cmo gtk.cmo gpointer.cmi gobject.cmi \
-+ gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gaux.cmo
-+gtkBase.cmx : pango.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \
-+ gtkEnums.cmx gtkBaseProps.cmx gtk.cmx gpointer.cmx gobject.cmx \
-+ gdkPixbuf.cmx gdkEvent.cmx gdk.cmx gaux.cmx
-+gtkPack.cmo : gtkPackProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo
-+gtkPack.cmx : gtkPackProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx
-+gtkButton.cmo : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtkButtonProps.cmo \
- gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi gaux.cmo
--gtkButton.cmx: gtkStock.cmx gtkSignal.cmx gtkEnums.cmx gtkButtonProps.cmx \
-+gtkButton.cmx : gtkStock.cmx gtkSignal.cmx gtkEnums.cmx gtkButtonProps.cmx \
- gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx gaux.cmx
--gtkAssistant.cmo: gtkBase.cmo gtkAssistantProps.cmo gtk.cmo gobject.cmi \
-+gtkAssistant.cmo : gtkBase.cmo gtkAssistantProps.cmo gtk.cmo gobject.cmi \
- gaux.cmo
--gtkAssistant.cmx: gtkBase.cmx gtkAssistantProps.cmx gtk.cmx gobject.cmx \
-+gtkAssistant.cmx : gtkBase.cmx gtkAssistantProps.cmx gtk.cmx gobject.cmx \
- gaux.cmx
--gtkMenu.cmo: gtkStock.cmo gtkMenuProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gtkMenu.cmo : gtkStock.cmo gtkMenuProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi gaux.cmo
--gtkMenu.cmx: gtkStock.cmx gtkMenuProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gtkMenu.cmx : gtkStock.cmx gtkMenuProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx gaux.cmx
--gtkMisc.cmo: gtkMiscProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo
--gtkMisc.cmx: gtkMiscProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx
--gtkWindow.cmo: gtkEnums.cmo gtkBaseProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-- gobject.cmi gdk.cmi gaux.cmo
--gtkWindow.cmx: gtkEnums.cmx gtkBaseProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-- gobject.cmx gdk.cmx gaux.cmx
--gtkList.cmo: gtkSignal.cmi gtkListProps.cmo gtkEnums.cmo gtkBase.cmo gtk.cmo \
-- gpointer.cmi gdk.cmi gaux.cmo
--gtkList.cmx: gtkSignal.cmx gtkListProps.cmx gtkEnums.cmx gtkBase.cmx gtk.cmx \
-- gpointer.cmx gdk.cmx gaux.cmx
--gtkBin.cmo: gtkBinProps.cmo gtkBase.cmo gtk.cmo gaux.cmo
--gtkBin.cmx: gtkBinProps.cmx gtkBase.cmx gtk.cmx gaux.cmx
--gtkEdit.cmo: gtkList.cmo gtkEditProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gtkMisc.cmo : gtkMiscProps.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo
-+gtkMisc.cmx : gtkMiscProps.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx
-+gtkWindow.cmo : gtkEnums.cmo gtkBaseProps.cmo gtkBase.cmo gtk.cmo \
-+ gpointer.cmi gobject.cmi gdk.cmi gaux.cmo
-+gtkWindow.cmx : gtkEnums.cmx gtkBaseProps.cmx gtkBase.cmx gtk.cmx \
-+ gpointer.cmx gobject.cmx gdk.cmx gaux.cmx
-+gtkList.cmo : gtkSignal.cmi gtkListProps.cmo gtkEnums.cmo gtkBase.cmo \
-+ gtk.cmo gpointer.cmi gdk.cmi gaux.cmo
-+gtkList.cmx : gtkSignal.cmx gtkListProps.cmx gtkEnums.cmx gtkBase.cmx \
-+ gtk.cmx gpointer.cmx gdk.cmx gaux.cmx
-+gtkBin.cmo : gtkBinProps.cmo gtkBase.cmo gtk.cmo gaux.cmo
-+gtkBin.cmx : gtkBinProps.cmx gtkBase.cmx gtk.cmx gaux.cmx
-+gtkEdit.cmo : gtkList.cmo gtkEditProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi gaux.cmo
--gtkEdit.cmx: gtkList.cmx gtkEditProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gtkEdit.cmx : gtkList.cmx gtkEditProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx gaux.cmx
--gtkRange.cmo: gtkRangeProps.cmo gtkBase.cmo gtk.cmo gaux.cmo
--gtkRange.cmx: gtkRangeProps.cmx gtkBase.cmx gtk.cmx gaux.cmx
--gtkText.cmo: pango.cmo gtkTextProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gtkRange.cmo : gtkRangeProps.cmo gtkBase.cmo gtk.cmo gaux.cmo
-+gtkRange.cmx : gtkRangeProps.cmx gtkBase.cmx gtk.cmx gaux.cmx
-+gtkText.cmo : pango.cmo gtkTextProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi glib.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo
--gtkText.cmx: pango.cmx gtkTextProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gtkText.cmx : pango.cmx gtkTextProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx glib.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx
--gtkTree.cmo: gtkTreeProps.cmo gtkEnums.cmo gtkBase.cmo gtk.cmo gobject.cmi \
-+gtkTree.cmo : gtkTreeProps.cmo gtkEnums.cmo gtkBase.cmo gtk.cmo gobject.cmi \
- gdk.cmi gaux.cmo
--gtkTree.cmx: gtkTreeProps.cmx gtkEnums.cmx gtkBase.cmx gtk.cmx gobject.cmx \
-+gtkTree.cmx : gtkTreeProps.cmx gtkEnums.cmx gtkBase.cmx gtk.cmx gobject.cmx \
- gdk.cmx gaux.cmx
--gtkFile.cmo: gtkObject.cmo gtkFileProps.cmo gtkEnums.cmo gtk.cmo
--gtkFile.cmx: gtkObject.cmx gtkFileProps.cmx gtkEnums.cmx gtk.cmx
--gtkMain.cmo: gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi
--gtkMain.cmx: gtk.cmx glib.cmx gdkEvent.cmx gdk.cmx
--gtkBroken.cmo: gtkBrokenProps.cmo gtkBase.cmo gtk.cmo gdk.cmi gaux.cmo
--gtkBroken.cmx: gtkBrokenProps.cmx gtkBase.cmx gtk.cmx gdk.cmx gaux.cmx
--gPango.cmo: pango.cmo gaux.cmo
--gPango.cmx: pango.cmx gaux.cmx
--gDraw.cmo: gtkBase.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi \
-+gtkFile.cmo : gtkObject.cmo gtkFileProps.cmo gtkEnums.cmo gtk.cmo
-+gtkFile.cmx : gtkObject.cmx gtkFileProps.cmx gtkEnums.cmx gtk.cmx
-+gtkMain.cmo : gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi
-+gtkMain.cmx : gtk.cmx glib.cmx gdkEvent.cmx gdk.cmx
-+gtkBroken.cmo : gtkBrokenProps.cmo gtkBase.cmo gtk.cmo gdk.cmi gaux.cmo
-+gtkBroken.cmx : gtkBrokenProps.cmx gtkBase.cmx gtk.cmx gdk.cmx gaux.cmx
-+gPango.cmo : pango.cmo gaux.cmo
-+gPango.cmx : pango.cmx gaux.cmx
-+gDraw.cmo : gtkBase.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi \
- gaux.cmo gDraw.cmi
--gDraw.cmx: gtkBase.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx \
-+gDraw.cmx : gtkBase.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx \
- gaux.cmx gDraw.cmi
--gObj.cmo: pango.cmo gtkStock.cmo gtkSignal.cmi gtkData.cmo gtkBase.cmo \
-+gObj.cmo : pango.cmo gtkStock.cmo gtkSignal.cmi gtkData.cmo gtkBase.cmo \
- gtk.cmo gpointer.cmi gobject.cmi gdk.cmi gaux.cmo gPango.cmo gDraw.cmi \
- gObj.cmi
--gObj.cmx: pango.cmx gtkStock.cmx gtkSignal.cmx gtkData.cmx gtkBase.cmx \
-+gObj.cmx : pango.cmx gtkStock.cmx gtkSignal.cmx gtkData.cmx gtkBase.cmx \
- gtk.cmx gpointer.cmx gobject.cmx gdk.cmx gaux.cmx gPango.cmx gDraw.cmx \
- gObj.cmi
--gData.cmo: gtkData.cmo gtkBin.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gData.cmo : gtkData.cmo gtkBin.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi gaux.cmo gObj.cmi gData.cmi
--gData.cmx: gtkData.cmx gtkBin.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gData.cmx : gtkData.cmx gtkBin.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx gaux.cmx gObj.cmx gData.cmi
--gMain.cmo: gtkMain.cmo gtk.cmo glib.cmi gdk.cmi gObj.cmi gData.cmi gMain.cmi
--gMain.cmx: gtkMain.cmx gtk.cmx glib.cmx gdk.cmx gObj.cmx gData.cmx gMain.cmi
--gContainer.cmo: ogtkBaseProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gMain.cmo : gtkMain.cmo gtk.cmo glib.cmi gdk.cmi gObj.cmi gData.cmi \
-+ gMain.cmi
-+gMain.cmx : gtkMain.cmx gtk.cmx glib.cmx gdk.cmx gObj.cmx gData.cmx \
-+ gMain.cmi
-+ogtkBaseProps.cmo : gtkSignal.cmi gtkBaseProps.cmo gobject.cmi gObj.cmi
-+ogtkBaseProps.cmx : gtkSignal.cmx gtkBaseProps.cmx gobject.cmx gObj.cmx
-+ogtkBinProps.cmo : gtkSignal.cmi gtkPackProps.cmo gtkBinProps.cmo \
-+ gobject.cmi gObj.cmi gData.cmi
-+ogtkBinProps.cmx : gtkSignal.cmx gtkPackProps.cmx gtkBinProps.cmx \
-+ gobject.cmx gObj.cmx gData.cmx
-+ogtkButtonProps.cmo : gtkSignal.cmi gtkButtonProps.cmo gobject.cmi gObj.cmi
-+ogtkButtonProps.cmx : gtkSignal.cmx gtkButtonProps.cmx gobject.cmx gObj.cmx
-+ogtkEditProps.cmo : gtkSignal.cmi gtkEditProps.cmo gobject.cmi gData.cmi
-+ogtkEditProps.cmx : gtkSignal.cmx gtkEditProps.cmx gobject.cmx gData.cmx
-+ogtkListProps.cmo : gtkSignal.cmi gtkListProps.cmo gobject.cmi
-+ogtkListProps.cmx : gtkSignal.cmx gtkListProps.cmx gobject.cmx
-+ogtkMenuProps.cmo : gtkSignal.cmi gtkMenuProps.cmo gobject.cmi
-+ogtkMenuProps.cmx : gtkSignal.cmx gtkMenuProps.cmx gobject.cmx
-+ogtkMiscProps.cmo : gtkSignal.cmi gtkMiscProps.cmo gobject.cmi gdkEvent.cmo \
-+ gObj.cmi
-+ogtkMiscProps.cmx : gtkSignal.cmx gtkMiscProps.cmx gobject.cmx gdkEvent.cmx \
-+ gObj.cmx
-+ogtkPackProps.cmo : gtkSignal.cmi gtkPackProps.cmo gobject.cmi gObj.cmi
-+ogtkPackProps.cmx : gtkSignal.cmx gtkPackProps.cmx gobject.cmx gObj.cmx
-+ogtkRangeProps.cmo : gtkSignal.cmi gtkRangeProps.cmo gobject.cmi gData.cmi
-+ogtkRangeProps.cmx : gtkSignal.cmx gtkRangeProps.cmx gobject.cmx gData.cmx
-+ogtkTextProps.cmo : gtkTextProps.cmo gtkSignal.cmi gobject.cmi gData.cmi
-+ogtkTextProps.cmx : gtkTextProps.cmx gtkSignal.cmx gobject.cmx gData.cmx
-+ogtkTreeProps.cmo : gtkTreeProps.cmo gtkSignal.cmi gobject.cmi gObj.cmi \
-+ gData.cmi
-+ogtkTreeProps.cmx : gtkTreeProps.cmx gtkSignal.cmx gobject.cmx gObj.cmx \
-+ gData.cmx
-+ogtkFileProps.cmo : gtkSignal.cmi gtkFileProps.cmo gobject.cmi gObj.cmi
-+ogtkFileProps.cmx : gtkSignal.cmx gtkFileProps.cmx gobject.cmx gObj.cmx
-+ogtkActionProps.cmo : gtkSignal.cmi gtkActionProps.cmo gobject.cmi gObj.cmi
-+ogtkActionProps.cmx : gtkSignal.cmx gtkActionProps.cmx gobject.cmx gObj.cmx
-+ogtkBrokenProps.cmo : gtkSignal.cmi gtkBrokenProps.cmo gobject.cmi gData.cmi
-+ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx
-+ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi
-+ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx
-+gContainer.cmo : ogtkBaseProps.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi
--gContainer.cmx: ogtkBaseProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gContainer.cmx : ogtkBaseProps.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmi
--gPack.cmo: ogtkPackProps.cmo gtkPack.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gPack.cmo : ogtkPackProps.cmo gtkPack.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gPack.cmi
--gPack.cmx: ogtkPackProps.cmx gtkPack.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gPack.cmx : ogtkPackProps.cmx gtkPack.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gPack.cmi
--gButton.cmo: ogtkButtonProps.cmo gtkButtonProps.cmo gtkButton.cmo gtkBase.cmo \
-- gtk.cmo gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi \
-- gButton.cmi
--gButton.cmx: ogtkButtonProps.cmx gtkButtonProps.cmx gtkButton.cmx gtkBase.cmx \
-- gtk.cmx gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx \
-- gButton.cmi
--gText.cmo: pango.cmo ogtkTextProps.cmo gtkText.cmo gtkSignal.cmi gtkBase.cmo \
-- gtk.cmo gobject.cmi glib.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gaux.cmo \
-- gObj.cmi gData.cmi gContainer.cmi gText.cmi
--gText.cmx: pango.cmx ogtkTextProps.cmx gtkText.cmx gtkSignal.cmx gtkBase.cmx \
-- gtk.cmx gobject.cmx glib.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx gaux.cmx \
-- gObj.cmx gData.cmx gContainer.cmx gText.cmi
--gMenu.cmo: ogtkMenuProps.cmo ogtkBaseProps.cmo gtkStock.cmo gtkMenu.cmo \
-+gButton.cmo : ogtkButtonProps.cmo gtkButtonProps.cmo gtkButton.cmo \
-+ gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo gObj.cmi gData.cmi \
-+ gContainer.cmi gButton.cmi
-+gButton.cmx : ogtkButtonProps.cmx gtkButtonProps.cmx gtkButton.cmx \
-+ gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx gObj.cmx gData.cmx \
-+ gContainer.cmx gButton.cmi
-+gText.cmo : pango.cmo ogtkTextProps.cmo gtkText.cmo gtkSignal.cmi \
-+ gtkBase.cmo gtk.cmo gobject.cmi glib.cmi gdkPixbuf.cmi gdkEvent.cmo \
-+ gdk.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gText.cmi
-+gText.cmx : pango.cmx ogtkTextProps.cmx gtkText.cmx gtkSignal.cmx \
-+ gtkBase.cmx gtk.cmx gobject.cmx glib.cmx gdkPixbuf.cmx gdkEvent.cmx \
-+ gdk.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gText.cmi
-+gMenu.cmo : ogtkMenuProps.cmo ogtkBaseProps.cmo gtkStock.cmo gtkMenu.cmo \
- gtkData.cmo gtkBase.cmo gtk.cmo gobject.cmi gaux.cmo gObj.cmi \
- gContainer.cmi gButton.cmi gMenu.cmi
--gMenu.cmx: ogtkMenuProps.cmx ogtkBaseProps.cmx gtkStock.cmx gtkMenu.cmx \
-+gMenu.cmx : ogtkMenuProps.cmx ogtkBaseProps.cmx gtkStock.cmx gtkMenu.cmx \
- gtkData.cmx gtkBase.cmx gtk.cmx gobject.cmx gaux.cmx gObj.cmx \
- gContainer.cmx gButton.cmx gMenu.cmi
--gMisc.cmo: ogtkMiscProps.cmo gtkSignal.cmi gtkMiscProps.cmo gtkMisc.cmo \
-+gMisc.cmo : ogtkMiscProps.cmo gtkSignal.cmi gtkMiscProps.cmo gtkMisc.cmo \
- gtkBase.cmo gtk.cmo gobject.cmi glib.cmi gaux.cmo gPack.cmi gObj.cmi \
- gDraw.cmi gContainer.cmi gMisc.cmi
--gMisc.cmx: ogtkMiscProps.cmx gtkSignal.cmx gtkMiscProps.cmx gtkMisc.cmx \
-+gMisc.cmx : ogtkMiscProps.cmx gtkSignal.cmx gtkMiscProps.cmx gtkMisc.cmx \
- gtkBase.cmx gtk.cmx gobject.cmx glib.cmx gaux.cmx gPack.cmx gObj.cmx \
- gDraw.cmx gContainer.cmx gMisc.cmi
--gTree.cmo: pango.cmo ogtkTreeProps.cmo ogtkBaseProps.cmo gtkTree.cmo \
-+gTree.cmo : pango.cmo ogtkTreeProps.cmo ogtkBaseProps.cmo gtkTree.cmo \
- gtkEnums.cmo gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi \
- gdkEnums.cmo gdk.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gTree.cmi
--gTree.cmx: pango.cmx ogtkTreeProps.cmx ogtkBaseProps.cmx gtkTree.cmx \
-+gTree.cmx : pango.cmx ogtkTreeProps.cmx ogtkBaseProps.cmx gtkTree.cmx \
- gtkEnums.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx gdkPixbuf.cmx \
- gdkEnums.cmx gdk.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gTree.cmi
--gList.cmo: ogtkListProps.cmo gtkList.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
-+gList.cmo : ogtkListProps.cmo gtkList.cmo gtkBase.cmo gtk.cmo gpointer.cmi \
- gobject.cmi gaux.cmo gObj.cmi gDraw.cmi gData.cmi gContainer.cmi \
- gList.cmi
--gList.cmx: ogtkListProps.cmx gtkList.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
-+gList.cmx : ogtkListProps.cmx gtkList.cmx gtkBase.cmx gtk.cmx gpointer.cmx \
- gobject.cmx gaux.cmx gObj.cmx gDraw.cmx gData.cmx gContainer.cmx \
- gList.cmi
--gFile.cmo: ogtkFileProps.cmo gtkSignal.cmi gtkFile.cmo gtkEnums.cmo gtk.cmo \
-+gFile.cmo : ogtkFileProps.cmo gtkSignal.cmi gtkFile.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi gaux.cmo gPack.cmi gObj.cmi gContainer.cmi gFile.cmi
--gFile.cmx: ogtkFileProps.cmx gtkSignal.cmx gtkFile.cmx gtkEnums.cmx gtk.cmx \
-+gFile.cmx : ogtkFileProps.cmx gtkSignal.cmx gtkFile.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx gaux.cmx gPack.cmx gObj.cmx gContainer.cmx gFile.cmi
--gWindow.cmo: ogtkFileProps.cmo ogtkBaseProps.cmo gtkWindow.cmo gtkStock.cmo \
-+gWindow.cmo : ogtkFileProps.cmo ogtkBaseProps.cmo gtkWindow.cmo gtkStock.cmo \
- gtkMisc.cmo gtkMain.cmo gtkFile.cmo gtkEnums.cmo gtkBaseProps.cmo \
- gtkBase.cmo gtk.cmo gobject.cmi gdk.cmi gaux.cmo gPack.cmi gObj.cmi \
- gMisc.cmi gList.cmi gFile.cmi gContainer.cmi gButton.cmi gWindow.cmi
--gWindow.cmx: ogtkFileProps.cmx ogtkBaseProps.cmx gtkWindow.cmx gtkStock.cmx \
-+gWindow.cmx : ogtkFileProps.cmx ogtkBaseProps.cmx gtkWindow.cmx gtkStock.cmx \
- gtkMisc.cmx gtkMain.cmx gtkFile.cmx gtkEnums.cmx gtkBaseProps.cmx \
- gtkBase.cmx gtk.cmx gobject.cmx gdk.cmx gaux.cmx gPack.cmx gObj.cmx \
- gMisc.cmx gList.cmx gFile.cmx gContainer.cmx gButton.cmx gWindow.cmi
--gAssistant.cmo: ogtkAssistantProps.cmo gtkWindow.cmo gtkMisc.cmo gtkBase.cmo \
-- gtkAssistant.cmo gtk.cmo gaux.cmo gWindow.cmi gObj.cmi gContainer.cmi \
-- gAssistant.cmi
--gAssistant.cmx: ogtkAssistantProps.cmx gtkWindow.cmx gtkMisc.cmx gtkBase.cmx \
-- gtkAssistant.cmx gtk.cmx gaux.cmx gWindow.cmx gObj.cmx gContainer.cmx \
-- gAssistant.cmi
--gBin.cmo: ogtkBinProps.cmo gtkBinProps.cmo gtkBin.cmo gtkBase.cmo gtk.cmo \
-+gAssistant.cmo : ogtkAssistantProps.cmo gtkWindow.cmo gtkMisc.cmo \
-+ gtkBase.cmo gtkAssistant.cmo gtk.cmo gaux.cmo gWindow.cmi gObj.cmi \
-+ gContainer.cmi gAssistant.cmi
-+gAssistant.cmx : ogtkAssistantProps.cmx gtkWindow.cmx gtkMisc.cmx \
-+ gtkBase.cmx gtkAssistant.cmx gtk.cmx gaux.cmx gWindow.cmx gObj.cmx \
-+ gContainer.cmx gAssistant.cmi
-+gBin.cmo : ogtkBinProps.cmo gtkBinProps.cmo gtkBin.cmo gtkBase.cmo gtk.cmo \
- gobject.cmi gaux.cmo gObj.cmi gData.cmi gContainer.cmi gBin.cmi
--gBin.cmx: ogtkBinProps.cmx gtkBinProps.cmx gtkBin.cmx gtkBase.cmx gtk.cmx \
-+gBin.cmx : ogtkBinProps.cmx gtkBinProps.cmx gtkBin.cmx gtkBase.cmx gtk.cmx \
- gobject.cmx gaux.cmx gObj.cmx gData.cmx gContainer.cmx gBin.cmi
--gEdit.cmo: ogtkEditProps.cmo gtkEdit.cmo gtkBase.cmo gtk.cmo gobject.cmi \
-+gEdit.cmo : ogtkEditProps.cmo gtkEdit.cmo gtkBase.cmo gtk.cmo gobject.cmi \
- gaux.cmo gTree.cmi gObj.cmi gMenu.cmi gList.cmi gData.cmi gContainer.cmi \
- gEdit.cmi
--gEdit.cmx: ogtkEditProps.cmx gtkEdit.cmx gtkBase.cmx gtk.cmx gobject.cmx \
-+gEdit.cmx : ogtkEditProps.cmx gtkEdit.cmx gtkBase.cmx gtk.cmx gobject.cmx \
- gaux.cmx gTree.cmx gObj.cmx gMenu.cmx gList.cmx gData.cmx gContainer.cmx \
- gEdit.cmi
--gRange.cmo: ogtkRangeProps.cmo gtkRange.cmo gtkBase.cmo gtk.cmo gaux.cmo \
-+gRange.cmo : ogtkRangeProps.cmo gtkRange.cmo gtkBase.cmo gtk.cmo gaux.cmo \
- gObj.cmi gData.cmi gRange.cmi
--gRange.cmx: ogtkRangeProps.cmx gtkRange.cmx gtkBase.cmx gtk.cmx gaux.cmx \
-+gRange.cmx : ogtkRangeProps.cmx gtkRange.cmx gtkBase.cmx gtk.cmx gaux.cmx \
- gObj.cmx gData.cmx gRange.cmi
--gAction.cmo: ogtkActionProps.cmo gtkSignal.cmi gtkActionProps.cmo gtk.cmo \
-+gAction.cmo : ogtkActionProps.cmo gtkSignal.cmi gtkActionProps.cmo gtk.cmo \
- gobject.cmi gaux.cmo gObj.cmi gAction.cmi
--gAction.cmx: ogtkActionProps.cmx gtkSignal.cmx gtkActionProps.cmx gtk.cmx \
-+gAction.cmx : ogtkActionProps.cmx gtkSignal.cmx gtkActionProps.cmx gtk.cmx \
- gobject.cmx gaux.cmx gObj.cmx gAction.cmi
--gBroken.cmo: ogtkEditProps.cmo ogtkBrokenProps.cmo ogtkBaseProps.cmo \
-+gBroken.cmo : ogtkEditProps.cmo ogtkBrokenProps.cmo ogtkBaseProps.cmo \
- gtkBroken.cmo gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi gaux.cmo \
- gObj.cmi gEdit.cmi gDraw.cmi gData.cmi gContainer.cmi gBroken.cmi
--gBroken.cmx: ogtkEditProps.cmx ogtkBrokenProps.cmx ogtkBaseProps.cmx \
-+gBroken.cmx : ogtkEditProps.cmx ogtkBrokenProps.cmx ogtkBaseProps.cmx \
- gtkBroken.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx gaux.cmx \
- gObj.cmx gEdit.cmx gDraw.cmx gData.cmx gContainer.cmx gBroken.cmi
--gUtil.cmo: gtkSignal.cmi gObj.cmi gUtil.cmi
--gUtil.cmx: gtkSignal.cmx gObj.cmx gUtil.cmi
--gToolbox.cmo: gdkKeysyms.cmo gdkEvent.cmo gWindow.cmi gText.cmi gPack.cmi \
-- gObj.cmi gMisc.cmi gMenu.cmi gMain.cmi gEdit.cmi gButton.cmi gBroken.cmi \
-- gBin.cmi gToolbox.cmi
--gToolbox.cmx: gdkKeysyms.cmx gdkEvent.cmx gWindow.cmx gText.cmx gPack.cmx \
-- gObj.cmx gMisc.cmx gMenu.cmx gMain.cmx gEdit.cmx gButton.cmx gBroken.cmx \
-- gBin.cmx gToolbox.cmi
--glGtk.cmo: gtkMisc.cmo gtkBase.cmo gtk.cmo gpointer.cmi gdkEvent.cmo gaux.cmo \
-- gObj.cmi glGtk.cmi
--glGtk.cmx: gtkMisc.cmx gtkBase.cmx gtk.cmx gpointer.cmx gdkEvent.cmx gaux.cmx \
-- gObj.cmx glGtk.cmi
--glade.cmo: gtkWindow.cmo gtkSignal.cmi gtkMain.cmo gtkBase.cmo gtk.cmo \
-+gUtil.cmo : gtkSignal.cmi gObj.cmi gUtil.cmi
-+gUtil.cmx : gtkSignal.cmx gObj.cmx gUtil.cmi
-+gToolbox.cmo : gtkSignal.cmi gtkMain.cmo gobject.cmi gdkKeysyms.cmo \
-+ gdkEvent.cmo gWindow.cmi gText.cmi gPack.cmi gObj.cmi gMisc.cmi gMenu.cmi \
-+ gMain.cmi gEdit.cmi gButton.cmi gBroken.cmi gBin.cmi gToolbox.cmi
-+gToolbox.cmx : gtkSignal.cmx gtkMain.cmx gobject.cmx gdkKeysyms.cmx \
-+ gdkEvent.cmx gWindow.cmx gText.cmx gPack.cmx gObj.cmx gMisc.cmx gMenu.cmx \
-+ gMain.cmx gEdit.cmx gButton.cmx gBroken.cmx gBin.cmx gToolbox.cmi
-+glGtk.cmo : gtkMisc.cmo gtkBase.cmo gtk.cmo gpointer.cmi gdkEvent.cmo \
-+ gaux.cmo gObj.cmi glGtk.cmi
-+glGtk.cmx : gtkMisc.cmx gtkBase.cmx gtk.cmx gpointer.cmx gdkEvent.cmx \
-+ gaux.cmx gObj.cmx glGtk.cmi
-+glade.cmo : gtkWindow.cmo gtkSignal.cmi gtkMain.cmo gtkBase.cmo gtk.cmo \
- gpointer.cmi gobject.cmi glade.cmi
--glade.cmx: gtkWindow.cmx gtkSignal.cmx gtkMain.cmx gtkBase.cmx gtk.cmx \
-+glade.cmx : gtkWindow.cmx gtkSignal.cmx gtkMain.cmx gtkBase.cmx gtk.cmx \
- gpointer.cmx gobject.cmx glade.cmi
--rsvg.cmo: gdkPixbuf.cmi gaux.cmo rsvg.cmi
--rsvg.cmx: gdkPixbuf.cmx gaux.cmx rsvg.cmi
--gnomeCanvas.cmo: gtkSignal.cmi gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi \
-+rsvg.cmo : gdkPixbuf.cmi gaux.cmo rsvg.cmi
-+rsvg.cmx : gdkPixbuf.cmx gaux.cmx rsvg.cmi
-+gnomeCanvas.cmo : gtkSignal.cmi gtkBase.cmo gtk.cmo gpointer.cmi gobject.cmi \
- gdkPixbuf.cmi gdk.cmi gaux.cmo gObj.cmi
--gnomeCanvas.cmx: gtkSignal.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx \
-+gnomeCanvas.cmx : gtkSignal.cmx gtkBase.cmx gtk.cmx gpointer.cmx gobject.cmx \
- gdkPixbuf.cmx gdk.cmx gaux.cmx gObj.cmx
--gnoCanvas.cmo: gtkEnums.cmo gtk.cmo gpointer.cmi gobject.cmi gnomeCanvas.cmo \
-- gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi gText.cmi gPack.cmi \
-- gObj.cmi gContainer.cmi gnoCanvas.cmi
--gnoCanvas.cmx: gtkEnums.cmx gtk.cmx gpointer.cmx gobject.cmx gnomeCanvas.cmx \
-- gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx gText.cmx gPack.cmx \
-- gObj.cmx gContainer.cmx gnoCanvas.cmi
--gnomeDruid.cmo: gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi
--gnomeDruid.cmx: gtkSignal.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx
--gnoDruid.cmo: gtk.cmo gobject.cmi gnomeDruid.cmo gPack.cmi gObj.cmi \
-+gnoCanvas.cmo : gtkEnums.cmo gtk.cmo gpointer.cmi gobject.cmi \
-+ gnomeCanvas.cmo gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi gText.cmi \
-+ gPack.cmi gObj.cmi gContainer.cmi gnoCanvas.cmi
-+gnoCanvas.cmx : gtkEnums.cmx gtk.cmx gpointer.cmx gobject.cmx \
-+ gnomeCanvas.cmx gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx gText.cmx \
-+ gPack.cmx gObj.cmx gContainer.cmx gnoCanvas.cmi
-+gnomeDruid.cmo : gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi
-+gnomeDruid.cmx : gtkSignal.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx
-+gnoDruid.cmo : gtk.cmo gobject.cmi gnomeDruid.cmo gPack.cmi gObj.cmi \
- gContainer.cmi gnoDruid.cmi
--gnoDruid.cmx: gtk.cmx gobject.cmx gnomeDruid.cmx gPack.cmx gObj.cmx \
-+gnoDruid.cmx : gtk.cmx gobject.cmx gnomeDruid.cmx gPack.cmx gObj.cmx \
- gContainer.cmx gnoDruid.cmi
--panel.cmo: gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi gdk.cmi gObj.cmi \
-+panel.cmo : gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi gdk.cmi gObj.cmi \
- gContainer.cmi panel.cmi
--panel.cmx: gtkSignal.cmx gtkEnums.cmx gtk.cmx gobject.cmx gdk.cmx gObj.cmx \
-+panel.cmx : gtkSignal.cmx gtkEnums.cmx gtk.cmx gobject.cmx gdk.cmx gObj.cmx \
- gContainer.cmx panel.cmi
--gtkSpell.cmo: gtk.cmo gtkSpell.cmi
--gtkSpell.cmx: gtk.cmx gtkSpell.cmi
--gtkSourceView2.cmo: sourceView2Enums.cmo gtkSourceView2_types.cmi \
-- gtkSourceView2Props.cmo gtkBase.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi \
-- gdk.cmi gaux.cmo
--gtkSourceView2.cmx: sourceView2Enums.cmx gtkSourceView2_types.cmi \
-- gtkSourceView2Props.cmx gtkBase.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx \
-- gdk.cmx gaux.cmx
--gSourceView2.cmo: ogtkSourceView2Props.cmo gtkText.cmo \
-+gtkSpell.cmo : gtk.cmo gtkSpell.cmi
-+gtkSpell.cmx : gtk.cmx gtkSpell.cmi
-+gtkSourceView2.cmo : gtkSourceView2_types.cmi gtkSourceView2Props.cmo \
-+ gtkBase.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo
-+gtkSourceView2.cmx : gtkSourceView2_types.cmi gtkSourceView2Props.cmx \
-+ gtkBase.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx
-+gSourceView2.cmo : ogtkSourceView2Props.cmo gtkText.cmo gtkStock.cmo \
- gtkSourceView2_types.cmi gtkSourceView2.cmo gtkBase.cmo gtk.cmo \
-- gobject.cmi gdk.cmi gaux.cmo gText.cmi gObj.cmi gContainer.cmi \
-- gSourceView2.cmi
--gSourceView2.cmx: ogtkSourceView2Props.cmx gtkText.cmx \
-+ gobject.cmi gdkPixbuf.cmi gdk.cmi gaux.cmo gWindow.cmi gText.cmi gObj.cmi \
-+ gContainer.cmi gSourceView2.cmi
-+gSourceView2.cmx : ogtkSourceView2Props.cmx gtkText.cmx gtkStock.cmx \
- gtkSourceView2_types.cmi gtkSourceView2.cmx gtkBase.cmx gtk.cmx \
-- gobject.cmx gdk.cmx gaux.cmx gText.cmx gObj.cmx gContainer.cmx \
-- gSourceView2.cmi
--gtkInit.cmo: gtkMain.cmo
--gtkInit.cmx: gtkMain.cmx
--gtkBaseProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmx gdkPixbuf.cmx gdk.cmx gaux.cmx gWindow.cmx gText.cmx gObj.cmx \
-+ gContainer.cmx gSourceView2.cmi
-+gtkInit.cmo : gtkMain.cmo
-+gtkInit.cmx : gtkMain.cmx
-+gtkBaseProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gpointer.cmi gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdkEnums.cmo gdk.cmi
--gtkBaseProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkBaseProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gpointer.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdkEnums.cmx gdk.cmx
--gtkBinProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo gobject.cmi \
-- gdk.cmi
--gtkBinProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx gobject.cmx \
-- gdk.cmx
--gtkButtonProps.cmo: gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-+gtkBinProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+ gobject.cmi gdk.cmi
-+gtkBinProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+ gobject.cmx gdk.cmx
-+gtkButtonProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
- gtk.cmo gobject.cmi gdk.cmi
--gtkButtonProps.cmx: gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-+gtkButtonProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
- gtk.cmx gobject.cmx gdk.cmx
--gtkEditProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+gtkEditProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi
--gtkEditProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkEditProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx
--gtkListProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+gtkListProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi gdkEvent.cmo
--gtkListProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkListProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx gdkEvent.cmx
--gtkMenuProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+gtkMenuProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi
--gtkMenuProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkMenuProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx
--gtkMiscProps.cmo: pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \
-+gtkMiscProps.cmo : pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkObject.cmo \
- gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi
--gtkMiscProps.cmx: pangoEnums.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \
-+gtkMiscProps.cmx : pangoEnums.cmx gtkStock.cmx gtkSignal.cmx gtkObject.cmx \
- gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx
--gtkPackProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+gtkPackProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi gdk.cmi
--gtkPackProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkPackProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx gdk.cmx
--gtkRangeProps.cmo: pangoEnums.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-+gtkRangeProps.cmo : pangoEnums.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
- gtk.cmo gobject.cmi
--gtkRangeProps.cmx: pangoEnums.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-+gtkRangeProps.cmx : pangoEnums.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
- gtk.cmx gobject.cmx
--gtkTextProps.cmo: pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \
-+gtkTextProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \
- gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi
--gtkTextProps.cmx: pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \
-+gtkTextProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \
- gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx gdk.cmx
--gtkTreeProps.cmo: pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \
-+gtkTreeProps.cmo : pangoEnums.cmo pango.cmo gtkSignal.cmi gtkObject.cmo \
- gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi
--gtkTreeProps.cmx: pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \
-+gtkTreeProps.cmx : pangoEnums.cmx pango.cmx gtkSignal.cmx gtkObject.cmx \
- gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx
--gtkFileProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+gtkFileProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi
--gtkFileProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkFileProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx
--gtkActionProps.cmo: gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
-+gtkActionProps.cmo : gtkStock.cmo gtkSignal.cmi gtkObject.cmo gtkEnums.cmo \
- gtk.cmo gobject.cmi
--gtkActionProps.cmx: gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
-+gtkActionProps.cmx : gtkStock.cmx gtkSignal.cmx gtkObject.cmx gtkEnums.cmx \
- gtk.cmx gobject.cmx
--gtkBrokenProps.cmo: gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi
--gtkBrokenProps.cmx: gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx
--gtkAssistantProps.cmo: gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
-+gtkBrokenProps.cmo : gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi
-+gtkBrokenProps.cmx : gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx
-+gtkAssistantProps.cmo : gtkSignal.cmi gtkObject.cmo gtkEnums.cmo gtk.cmo \
- gobject.cmi gdkPixbuf.cmi
--gtkAssistantProps.cmx: gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
-+gtkAssistantProps.cmx : gtkSignal.cmx gtkObject.cmx gtkEnums.cmx gtk.cmx \
- gobject.cmx gdkPixbuf.cmx
--ogtkBaseProps.cmo: gtkSignal.cmi gtkBaseProps.cmo gobject.cmi gObj.cmi
--ogtkBaseProps.cmx: gtkSignal.cmx gtkBaseProps.cmx gobject.cmx gObj.cmx
--ogtkBinProps.cmo: gtkSignal.cmi gtkPackProps.cmo gtkBinProps.cmo gobject.cmi \
-- gObj.cmi gData.cmi
--ogtkBinProps.cmx: gtkSignal.cmx gtkPackProps.cmx gtkBinProps.cmx gobject.cmx \
-- gObj.cmx gData.cmx
--ogtkButtonProps.cmo: gtkSignal.cmi gtkButtonProps.cmo gobject.cmi gObj.cmi
--ogtkButtonProps.cmx: gtkSignal.cmx gtkButtonProps.cmx gobject.cmx gObj.cmx
--ogtkEditProps.cmo: gtkSignal.cmi gtkEditProps.cmo gobject.cmi gData.cmi
--ogtkEditProps.cmx: gtkSignal.cmx gtkEditProps.cmx gobject.cmx gData.cmx
--ogtkListProps.cmo: gtkSignal.cmi gtkListProps.cmo gobject.cmi
--ogtkListProps.cmx: gtkSignal.cmx gtkListProps.cmx gobject.cmx
--ogtkMenuProps.cmo: gtkSignal.cmi gtkMenuProps.cmo gobject.cmi
--ogtkMenuProps.cmx: gtkSignal.cmx gtkMenuProps.cmx gobject.cmx
--ogtkMiscProps.cmo: gtkSignal.cmi gtkMiscProps.cmo gobject.cmi gdkEvent.cmo \
-+ogtkBaseProps.cmo : gtkSignal.cmi gtkBaseProps.cmo gobject.cmi gObj.cmi
-+ogtkBaseProps.cmx : gtkSignal.cmx gtkBaseProps.cmx gobject.cmx gObj.cmx
-+ogtkBinProps.cmo : gtkSignal.cmi gtkPackProps.cmo gtkBinProps.cmo \
-+ gobject.cmi gObj.cmi gData.cmi
-+ogtkBinProps.cmx : gtkSignal.cmx gtkPackProps.cmx gtkBinProps.cmx \
-+ gobject.cmx gObj.cmx gData.cmx
-+ogtkButtonProps.cmo : gtkSignal.cmi gtkButtonProps.cmo gobject.cmi gObj.cmi
-+ogtkButtonProps.cmx : gtkSignal.cmx gtkButtonProps.cmx gobject.cmx gObj.cmx
-+ogtkEditProps.cmo : gtkSignal.cmi gtkEditProps.cmo gobject.cmi gData.cmi
-+ogtkEditProps.cmx : gtkSignal.cmx gtkEditProps.cmx gobject.cmx gData.cmx
-+ogtkListProps.cmo : gtkSignal.cmi gtkListProps.cmo gobject.cmi
-+ogtkListProps.cmx : gtkSignal.cmx gtkListProps.cmx gobject.cmx
-+ogtkMenuProps.cmo : gtkSignal.cmi gtkMenuProps.cmo gobject.cmi
-+ogtkMenuProps.cmx : gtkSignal.cmx gtkMenuProps.cmx gobject.cmx
-+ogtkMiscProps.cmo : gtkSignal.cmi gtkMiscProps.cmo gobject.cmi gdkEvent.cmo \
- gObj.cmi
--ogtkMiscProps.cmx: gtkSignal.cmx gtkMiscProps.cmx gobject.cmx gdkEvent.cmx \
-+ogtkMiscProps.cmx : gtkSignal.cmx gtkMiscProps.cmx gobject.cmx gdkEvent.cmx \
- gObj.cmx
--ogtkPackProps.cmo: gtkSignal.cmi gtkPackProps.cmo gobject.cmi
--ogtkPackProps.cmx: gtkSignal.cmx gtkPackProps.cmx gobject.cmx
--ogtkRangeProps.cmo: gtkSignal.cmi gtkRangeProps.cmo gobject.cmi gData.cmi
--ogtkRangeProps.cmx: gtkSignal.cmx gtkRangeProps.cmx gobject.cmx gData.cmx
--ogtkTextProps.cmo: gtkTextProps.cmo gtkSignal.cmi gobject.cmi gData.cmi
--ogtkTextProps.cmx: gtkTextProps.cmx gtkSignal.cmx gobject.cmx gData.cmx
--ogtkTreeProps.cmo: gtkTreeProps.cmo gtkSignal.cmi gobject.cmi gObj.cmi \
-+ogtkPackProps.cmo : gtkSignal.cmi gtkPackProps.cmo gobject.cmi gObj.cmi
-+ogtkPackProps.cmx : gtkSignal.cmx gtkPackProps.cmx gobject.cmx gObj.cmx
-+ogtkRangeProps.cmo : gtkSignal.cmi gtkRangeProps.cmo gobject.cmi gData.cmi
-+ogtkRangeProps.cmx : gtkSignal.cmx gtkRangeProps.cmx gobject.cmx gData.cmx
-+ogtkTextProps.cmo : gtkTextProps.cmo gtkSignal.cmi gobject.cmi gData.cmi
-+ogtkTextProps.cmx : gtkTextProps.cmx gtkSignal.cmx gobject.cmx gData.cmx
-+ogtkTreeProps.cmo : gtkTreeProps.cmo gtkSignal.cmi gobject.cmi gObj.cmi \
- gData.cmi
--ogtkTreeProps.cmx: gtkTreeProps.cmx gtkSignal.cmx gobject.cmx gObj.cmx \
-+ogtkTreeProps.cmx : gtkTreeProps.cmx gtkSignal.cmx gobject.cmx gObj.cmx \
- gData.cmx
--ogtkFileProps.cmo: gtkSignal.cmi gtkFileProps.cmo gobject.cmi gObj.cmi
--ogtkFileProps.cmx: gtkSignal.cmx gtkFileProps.cmx gobject.cmx gObj.cmx
--ogtkActionProps.cmo: gtkSignal.cmi gtkActionProps.cmo gobject.cmi gObj.cmi
--ogtkActionProps.cmx: gtkSignal.cmx gtkActionProps.cmx gobject.cmx gObj.cmx
--ogtkBrokenProps.cmo: gtkSignal.cmi gtkBrokenProps.cmo gobject.cmi gData.cmi
--ogtkBrokenProps.cmx: gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx
--ogtkAssistantProps.cmo: gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi
--ogtkAssistantProps.cmx: gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx
--gtkThread.cmo: gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi
--gtkThread.cmx: gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi
--gtkThInit.cmo: gtkThread.cmi
--gtkThInit.cmx: gtkThread.cmx
--gtkSourceView.cmo: sourceViewEnums.cmo gtkSourceView_types.cmi \
-+ogtkFileProps.cmo : gtkSignal.cmi gtkFileProps.cmo gobject.cmi gObj.cmi
-+ogtkFileProps.cmx : gtkSignal.cmx gtkFileProps.cmx gobject.cmx gObj.cmx
-+ogtkActionProps.cmo : gtkSignal.cmi gtkActionProps.cmo gobject.cmi gObj.cmi
-+ogtkActionProps.cmx : gtkSignal.cmx gtkActionProps.cmx gobject.cmx gObj.cmx
-+ogtkBrokenProps.cmo : gtkSignal.cmi gtkBrokenProps.cmo gobject.cmi gData.cmi
-+ogtkBrokenProps.cmx : gtkSignal.cmx gtkBrokenProps.cmx gobject.cmx gData.cmx
-+ogtkAssistantProps.cmo : gtkSignal.cmi gtkAssistantProps.cmo gobject.cmi
-+ogtkAssistantProps.cmx : gtkSignal.cmx gtkAssistantProps.cmx gobject.cmx
-+gtkThread.cmo : gtkSignal.cmi gtkMain.cmo glib.cmi gtkThread.cmi
-+gtkThread.cmx : gtkSignal.cmx gtkMain.cmx glib.cmx gtkThread.cmi
-+gtkThTop.cmo : gtkThread.cmi
-+gtkThTop.cmx : gtkThread.cmx
-+gtkSourceView.cmo : sourceViewEnums.cmo gtkSourceView_types.cmi \
- gtkSourceViewProps.cmo gtkBase.cmo gtk.cmo gobject.cmi glib.cmi \
- gdkPixbuf.cmi gdk.cmi gaux.cmo
--gtkSourceView.cmx: sourceViewEnums.cmx gtkSourceView_types.cmi \
-+gtkSourceView.cmx : sourceViewEnums.cmx gtkSourceView_types.cmi \
- gtkSourceViewProps.cmx gtkBase.cmx gtk.cmx gobject.cmx glib.cmx \
- gdkPixbuf.cmx gdk.cmx gaux.cmx
--gSourceView.cmo: ogtkTextProps.cmo ogtkSourceViewProps.cmo gtkText.cmo \
-+gSourceView.cmo : ogtkTextProps.cmo ogtkSourceViewProps.cmo gtkText.cmo \
- gtkSourceView_types.cmi gtkSourceView.cmo gtkBase.cmo gtk.cmo gobject.cmi \
- gdk.cmi gaux.cmo gText.cmi gObj.cmi gContainer.cmi gSourceView.cmi
--gSourceView.cmx: ogtkTextProps.cmx ogtkSourceViewProps.cmx gtkText.cmx \
-+gSourceView.cmx : ogtkTextProps.cmx ogtkSourceViewProps.cmx gtkText.cmx \
- gtkSourceView_types.cmi gtkSourceView.cmx gtkBase.cmx gtk.cmx gobject.cmx \
- gdk.cmx gaux.cmx gText.cmx gObj.cmx gContainer.cmx gSourceView.cmi
--gtkSourceViewProps.cmo: gtkSourceView_types.cmi gtkSignal.cmi gtkObject.cmo \
-+gtkSourceViewProps.cmo : gtkSourceView_types.cmi gtkSignal.cmi gtkObject.cmo \
- gtk.cmo gobject.cmi gdk.cmi
--gtkSourceViewProps.cmx: gtkSourceView_types.cmi gtkSignal.cmx gtkObject.cmx \
-+gtkSourceViewProps.cmx : gtkSourceView_types.cmi gtkSignal.cmx gtkObject.cmx \
- gtk.cmx gobject.cmx gdk.cmx
--ogtkSourceViewProps.cmo: gtkSourceViewProps.cmo gtkSignal.cmi gobject.cmi
--ogtkSourceViewProps.cmx: gtkSourceViewProps.cmx gtkSignal.cmx gobject.cmx
--sourceViewEnums.cmo: gpointer.cmi gobject.cmi
--sourceViewEnums.cmx: gpointer.cmx gobject.cmx
--gtkSourceView2Props.cmo: sourceView2Enums.cmo gtkSourceView2_types.cmi \
-- gtkSignal.cmi gtkObject.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi
--gtkSourceView2Props.cmx: sourceView2Enums.cmx gtkSourceView2_types.cmi \
-- gtkSignal.cmx gtkObject.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdk.cmx
--ogtkSourceView2Props.cmo: gtkSourceView2Props.cmo gtkSignal.cmi gobject.cmi
--ogtkSourceView2Props.cmx: gtkSourceView2Props.cmx gtkSignal.cmx gobject.cmx
--sourceViewEnums.cmo: gpointer.cmi gobject.cmi
--sourceViewEnums.cmx: gpointer.cmx gobject.cmx
--gtkSignal.cmo: gobject.cmi gtkSignal.cmi
--gtkSignal.cmx: gobject.cmx gtkSignal.cmi
--gAction.cmi: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \
-+ogtkSourceViewProps.cmo : gtkSourceViewProps.cmo gtkSignal.cmi gobject.cmi
-+ogtkSourceViewProps.cmx : gtkSourceViewProps.cmx gtkSignal.cmx gobject.cmx
-+sourceViewEnums.cmo : gpointer.cmi gobject.cmi
-+sourceViewEnums.cmx : gpointer.cmx gobject.cmx
-+gtkSourceView2Props.cmo : gtkSourceView2_types.cmi gtkSignal.cmi \
-+ gtkObject.cmo gtkEnums.cmo gtk.cmo gobject.cmi gdkPixbuf.cmi gdkEvent.cmo \
-+ gdk.cmi
-+gtkSourceView2Props.cmx : gtkSourceView2_types.cmi gtkSignal.cmx \
-+ gtkObject.cmx gtkEnums.cmx gtk.cmx gobject.cmx gdkPixbuf.cmx gdkEvent.cmx \
-+ gdk.cmx
-+ogtkSourceView2Props.cmo : gtkSourceView2Props.cmo gtkSignal.cmi gobject.cmi
-+ogtkSourceView2Props.cmx : gtkSourceView2Props.cmx gtkSignal.cmx gobject.cmx
-+sourceViewEnums.cmo : gpointer.cmi gobject.cmi
-+sourceViewEnums.cmx : gpointer.cmx gobject.cmx
-+gtkSignal.cmo : gobject.cmi gtkSignal.cmi
-+gtkSignal.cmx : gobject.cmx gtkSignal.cmi
-+gAction.cmi : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \
- gObj.cmi
--gAssistant.cmi: gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi gdkEnums.cmo \
-- gdk.cmi gWindow.cmi gObj.cmi gContainer.cmi
--gBin.cmi: gtkSignal.cmi gtk.cmo gObj.cmi gData.cmi gContainer.cmi
--gBroken.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gdk.cmi gObj.cmi gEdit.cmi \
-- gDraw.cmi gData.cmi gContainer.cmi
--gButton.cmi: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \
-- gData.cmi gContainer.cmi
--gContainer.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gObj.cmi gData.cmi
--gData.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gObj.cmi
--gDraw.cmi: pango.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi
--gEdit.cmi: gtkSignal.cmi gtk.cmo gTree.cmi gObj.cmi gMenu.cmi gList.cmi \
-- gData.cmi gContainer.cmi
--gFile.cmi: gtkSignal.cmi gtkEnums.cmo gtk.cmo gPack.cmi gObj.cmi \
-- gContainer.cmi
--gList.cmi: gtkSignal.cmi gtk.cmo gdkEvent.cmo gObj.cmi gDraw.cmi gData.cmi \
-+gAssistant.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \
-+ gdkEnums.cmo gdk.cmi gWindow.cmi gObj.cmi gContainer.cmi
-+gBin.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gObj.cmi gData.cmi \
- gContainer.cmi
--gMain.cmi: gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi
--gMenu.cmi: gtkStock.cmo gtkSignal.cmi gtk.cmo gdk.cmi gObj.cmi gContainer.cmi \
-- gButton.cmi
--gMisc.cmi: pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtk.cmo gobject.cmi \
-- gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gPack.cmi gObj.cmi gDraw.cmi \
-+gBroken.cmi : gtkSignal.cmi gtk.cmo gobject.cmi gdk.cmi gObj.cmi gEdit.cmi \
-+ gDraw.cmi gData.cmi gContainer.cmi
-+gButton.cmi : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi \
-+ gObj.cmi gData.cmi gContainer.cmi
-+gContainer.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi gObj.cmi \
-+ gData.cmi
-+gData.cmi : gtkSignal.cmi gtk.cmo gobject.cmi gdkPixbuf.cmi gdk.cmi gObj.cmi
-+gDraw.cmi : pango.cmo gpointer.cmi gobject.cmi gdkPixbuf.cmi gdk.cmi
-+gEdit.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gTree.cmi gObj.cmi gMenu.cmi \
-+ gList.cmi gData.cmi gContainer.cmi
-+gFile.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gPack.cmi gObj.cmi \
- gContainer.cmi
--gObj.cmi: pango.cmo gtkStock.cmo gtkSignal.cmi gtk.cmo gobject.cmi \
-+gList.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkEvent.cmo gObj.cmi \
-+ gDraw.cmi gData.cmi gContainer.cmi
-+gMain.cmi : gtk.cmo glib.cmi gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi
-+gMenu.cmi : gtkStock.cmo gtkSignal.cmi gtk.cmo gdk.cmi gObj.cmi \
-+ gContainer.cmi gButton.cmi
-+gMisc.cmi : pangoEnums.cmo gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo \
-+ gobject.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gPack.cmi gObj.cmi \
-+ gDraw.cmi gContainer.cmi
-+gObj.cmi : pango.cmo gtkStock.cmo gtkSignal.cmi gtk.cmo gobject.cmi \
- gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gPango.cmo gDraw.cmi
--gPack.cmi: gtkSignal.cmi gtkPack.cmo gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \
-+gPack.cmi : gtkSignal.cmi gtkPack.cmo gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \
- gData.cmi gContainer.cmi
--gRange.cmi: pangoEnums.cmo gtkSignal.cmi gtk.cmo gObj.cmi gData.cmi
--gSourceView.cmi: sourceViewEnums.cmo gtkSourceView_types.cmi gtkSignal.cmi \
-+gRange.cmi : pangoEnums.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gObj.cmi \
-+ gData.cmi
-+gSourceView.cmi : sourceViewEnums.cmo gtkSourceView_types.cmi gtkSignal.cmi \
- gtkEnums.cmo gtk.cmo glib.cmi gdkPixbuf.cmi gdk.cmi gText.cmi gObj.cmi
--gSourceView2.cmi: sourceView2Enums.cmo ogtkSourceView2Props.cmo \
-+gSourceView2.cmi : ogtkSourceView2Props.cmo gtkStock.cmo \
- gtkSourceView2_types.cmi gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \
-- gdk.cmi gText.cmi gObj.cmi
--gText.cmi: pango.cmo gtkSignal.cmi gtk.cmo gobject.cmi glib.cmi gdkPixbuf.cmi \
-- gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi
--gToolbox.cmi: gtk.cmo gText.cmi gObj.cmi gMenu.cmi gList.cmi gBroken.cmi
--gTree.cmi: pango.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \
-+ gdkEvent.cmo gdk.cmi gWindow.cmi gText.cmi gObj.cmi gContainer.cmi
-+gText.cmi : pango.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \
-+ glib.cmi gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gObj.cmi gData.cmi
-+gToolbox.cmi : gtk.cmo gWindow.cmi gText.cmi gObj.cmi gMenu.cmi gList.cmi \
-+ gBroken.cmi
-+gTree.cmi : pango.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gobject.cmi \
- gdkPixbuf.cmi gdkEnums.cmo gdk.cmi gObj.cmi gData.cmi gContainer.cmi
--gUtil.cmi: gtkSignal.cmi gtk.cmo gObj.cmi
--gWindow.cmi: gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \
-+gUtil.cmi : gtkSignal.cmi gtk.cmo gObj.cmi
-+gWindow.cmi : gtkStock.cmo gtkSignal.cmi gtkEnums.cmo gtk.cmo gdkPixbuf.cmi \
- gdkEnums.cmo gdk.cmi gPack.cmi gObj.cmi gMisc.cmi gList.cmi gFile.cmi \
- gContainer.cmi gButton.cmi
--gdk.cmi: pango.cmo gpointer.cmi gobject.cmi
--gdkPixbuf.cmi: gpointer.cmi gobject.cmi gdk.cmi
--glGtk.cmi: gtkSignal.cmi gtk.cmo gpointer.cmi gObj.cmi
--glade.cmi: gtk.cmo gobject.cmi
--glib.cmi:
--gnoCanvas.cmi: gtkSignal.cmi gtk.cmo gobject.cmi gnomeCanvas.cmo \
-+gdk.cmi : pango.cmo gpointer.cmi gobject.cmi
-+gdkPixbuf.cmi : gpointer.cmi gobject.cmi gdk.cmi
-+glGtk.cmi : gtkSignal.cmi gtk.cmo gpointer.cmi gObj.cmi
-+glade.cmi : gtk.cmo gobject.cmi
-+glib.cmi :
-+gnoCanvas.cmi : gtkSignal.cmi gtk.cmo gobject.cmi gnomeCanvas.cmo \
- gdkPixbuf.cmi gdkEvent.cmo gdk.cmi gText.cmi gPack.cmi gObj.cmi
--gnoDruid.cmi: gtkSignal.cmi gtk.cmo gnomeDruid.cmo gdkPixbuf.cmi gdk.cmi \
-+gnoDruid.cmi : gtkSignal.cmi gtk.cmo gnomeDruid.cmo gdkPixbuf.cmi gdk.cmi \
- gPack.cmi gObj.cmi gContainer.cmi
--gobject.cmi: gpointer.cmi
--gpointer.cmi:
--gtkSignal.cmi: gobject.cmi
--gtkSourceView2_types.cmi: gtk.cmo
--gtkSourceView_types.cmi: gtk.cmo
--gtkSpell.cmi: gText.cmi
--gtkThread.cmi:
--gutf8.cmi:
--panel.cmi: gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi gContainer.cmi
--rsvg.cmi: gdkPixbuf.cmi
--xml_lexer.cmi:
-+gobject.cmi : gpointer.cmi
-+gpointer.cmi :
-+gtkSignal.cmi : gobject.cmi
-+gtkSourceView2_types.cmi : gtk.cmo
-+gtkSourceView_types.cmi : gtk.cmo
-+gtkSpell.cmi : gText.cmi
-+gtkThread.cmi :
-+gutf8.cmi :
-+panel.cmi : gtkSignal.cmi gtkEnums.cmo gtk.cmo gdk.cmi gObj.cmi \
-+ gContainer.cmi
-+rsvg.cmi : gdkPixbuf.cmi
-+xml_lexer.cmi :
-diff --git src/Makefile src/Makefile
-index c498882..c4d1b75 100755
---- src/Makefile
-+++ src/Makefile
-@@ -274,7 +274,7 @@ lablgtktop$(XE): $(MLLIBS) $(THOBJS) $(CONFIG)
- endif
-
- lablgtk2: Makefile $(CONFIG) lablgtk2.in
-- sed -e "s|@INSTALLDIR@|$(INSTALLDIR)|g" \
-+ sed -e "s|@INSTALLDIR@|$(LABLGTKDIR)|g" \
- -e "s|@LABLGLDIR@|$(LABLGLDIR)|g" \
- -e "s|@MLLIBS@|$(MLLINK) $(MLLIBS)|g" \
- -e "s|@INITOBJS@|$(INITOBJS)|g" \
-@@ -343,7 +343,7 @@ preinstall:
- old-install:
- mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)"
- cp $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) "$(INSTALLDIR)"
-- cp -p *.mli "$(INSTALLDIR)"
-+ cp -p ../META *.mli "$(INSTALLDIR)"
- cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) \
- $(EXTRA_OBJS:.cmo=.ml) build.ml "$(INSTALLDIR)"
- cp $(EXTRA_MLLIBS) $(MLLIBS) $(INITOBJS) "$(INSTALLDIR)"
-@@ -390,8 +390,16 @@ old-uninstall:
-
- # Install using ocamlfind
- findlib-install:
-+ @if test "$(OCAMLFIND)" = no; then \
-+ echo "Cannot use ocamlfind, use old-install."; \
-+ exit 2; fi
- mkdir -p "$(BINDIR)"
-- ocamlfind install lablgtk2 ../META \
-+ mkdir -p "$(DESTDIR)$(FINDLIBDIR)"
-+ @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \
-+ touch "$(DESTDIR)$(OCAMLLDCONF)"; fi
-+ $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \
-+ -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \
-+ lablgtk2 ../META \
- build.ml \
- $(CLIBS) \
- $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) \
-@@ -427,19 +435,22 @@ findlib-install:
- then \
- echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \
- fi`
-- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%)
-- @if test -f lablgtk.cmxa; \
-- then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi
-- rm lablgtk2$(XB)
-- $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB)
-+ rm -f lablgtk2
-+ $(MAKE) lablgtk2 LABLGTKDIR="$(FINDLIBDIR)/lablgtk2"
- cp lablgtk2$(XB) "$(BINDIR)"
- if test -f lablgladecc$(XE); then \
- cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \
- fi
- cp gdk_pixbuf_mlsource$(XE) "$(BINDIR)"
-+ $(RANLIB) $(CLIBS:%=$(FLINSTALLDIR)/%)
-+ @if test -f lablgtk.cmxa; then \
-+ echo "Execute $(RANLIB) in $(FLINSTALLDIR)"; \
-+ $(RANLIB) $(MLLIBS:%.cma=$(FLINSTALLDIR)/%$(XA)) \
-+ $(EXTRA_MLLIBS:%.cma=$(FLINSTALLDIR)/%$(XA)) ; \
-+ fi
-
- findlib-uninstall:
-- ocamlfind remove lablgtk2
-+ $(OCAMLFIND) remove lablgtk2
- for f in lablgladecc2$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE); \
- do rm -f "$(BINDIR)"/$$f; done
-
-diff --git src/gFile.ml src/gFile.ml
-index d5eeb96..6346785 100644
---- src/gFile.ml
-+++ src/gFile.ml
-@@ -179,7 +179,7 @@ let chooser_widget ~action ?backend ?packing ?show () =
- FileChooser.P.file_system_backend backend
- [ Gobject.param FileChooser.P.action action ]) in
- let o = new chooser_widget w in
-- GObj.pack_return o ?packing ?show
-+ GObj.pack_return o ~packing ~show
-
- class chooser_button_signals obj = object
- inherit GContainer.container_signals_impl obj
-diff --git src/gMenu.ml src/gMenu.ml
-index b280e58..e87b8da 100644
---- src/gMenu.ml
-+++ src/gMenu.ml
-@@ -87,9 +87,9 @@ end
-
- class menu_item_skel = [menu_item] pre_menu_item_skel
-
--let pack_item self ~packing ~show =
-+let pack_item ?packing ?(show=true) self =
- may packing ~f:(fun f -> (f (self :> menu_item) : unit));
-- if show <> Some false then self#misc#show ();
-+ if show then self#misc#show ();
- self
-
- let menu_item ?use_mnemonic ?label ?right_justified ?packing ?show () =
-diff --git src/gdk.ml src/gdk.ml
-index b3f4b6c..cb5759b 100644
---- src/gdk.ml
-+++ src/gdk.ml
-@@ -137,7 +137,8 @@ module Convert = struct
- = "ml_test_GdkModifier_val"
- let modifier i =
- List.filter [`SHIFT;`LOCK;`CONTROL;`MOD1;`MOD2;`MOD3;`MOD4;`MOD5;
-- `BUTTON1;`BUTTON2;`BUTTON3;`BUTTON4;`BUTTON5]
-+ `BUTTON1;`BUTTON2;`BUTTON3;`BUTTON4;`BUTTON5;`SUPER;
-+ `HYPER;`META;`RELEASE]
- ~f:(fun m -> test_modifier m i)
- external test_window_state : window_state -> int -> bool
- = "ml_test_GdkWindowState_val"
-diff --git src/gtkSignal.ml4 src/gtkSignal.ml4
-index 918a508..1e9e23e 100644
---- src/gtkSignal.ml4
-+++ src/gtkSignal.ml4
-@@ -200,6 +200,6 @@ let connect ~sgn: ((sgn:('a, _) t)) ~callback ?after (obj : 'a obj) =
-
- let connect_property ~(prop:('a, _) property) ~callback (obj : 'a obj) =
- let name = "notify::" ^ prop.Gobject.name in
-- let callback = fun () -> callback (get prop obj) in
-- connect_aux ~name ~marshaller:marshal_unit ~callback obj
-+ let marshaller = marshal1 prop.conv name in
-+ connect_aux ~name ~marshaller ~callback obj
-
-diff --git src/ml_glib.c src/ml_glib.c
-index 82e1c36..b776c54 100644
---- src/ml_glib.c
-+++ src/ml_glib.c
-@@ -243,7 +243,7 @@ ML_2(g_log_set_fatal_mask, String_option_val, Int_val, Unit)
-
- CAMLprim value ml_g_log (value domain, value level, value msg)
- {
-- g_log (String_option_val(domain), Int_val(level), "%s", String_val(msg));
-+ g_log (String_val(domain), Int_val(level), "%s", String_val(msg));
- return Val_unit;
- }
-
-diff --git src/ml_gtkstock.c src/ml_gtkstock.c
-index 8723ed1..f506ae6 100644
---- src/ml_gtkstock.c
-+++ src/ml_gtkstock.c
-@@ -139,6 +139,8 @@ CAMLprim value ml_gtk_stock_lookup(value id)
- TESTANDCONS(MOD4); TESTANDCONS(MOD5);
- TESTANDCONS(BUTTON1); TESTANDCONS(BUTTON2); TESTANDCONS(BUTTON3);
- TESTANDCONS(BUTTON4); TESTANDCONS(BUTTON5);
-+ TESTANDCONS(SUPER); TESTANDCONS(HYPER);
-+ TESTANDCONS(META); TESTANDCONS(RELEASE);
- stock_result = alloc_tuple(4);
- Store_field(stock_result,0,Val_string(r.stock_id));
- Store_field(stock_result,1,Val_string(r.label));
Index: x11-toolkits/ocaml-lablgtk2/files/patch-src_Makefile
===================================================================
--- x11-toolkits/ocaml-lablgtk2/files/patch-src_Makefile
+++ x11-toolkits/ocaml-lablgtk2/files/patch-src_Makefile
@@ -0,0 +1,14 @@
+--- src/Makefile.orig 2012-08-23 10:37:48 UTC
++++ src/Makefile
+@@ -427,9 +427,9 @@ findlib-install:
+ then \
+ echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \
+ fi`
+- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%)
++ $(RANLIB) $(CLIBS)
+ @if test -f lablgtk.cmxa; \
+- then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi
++ then ($(RANLIB) $(MLLIBS:.cma=$(XA)) $(EXTRA_MLLIBS:.cma=$(XA)) ); fi
+ rm lablgtk2$(XB)
+ $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB)
+ cp lablgtk2$(XB) "$(BINDIR)"

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 9:32 PM (8 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16780663
Default Alt Text
D2434.id5164.diff (95 KB)

Event Timeline