--- a/ocaml-3.09.3/configure	Thu Mar 30 19:00:19 2006
+++ b/ocaml-3.09.3/configure	Tue Jun  3 22:06:16 2008
@@ -303,6 +303,8 @@
 
 # Configure compiler to use in further tests
 
+bytecccompopts="$CPPFLAGS $bytecclinkopts"
+bytecclinkopts="$LDFLAGS $bytecclinkopts"
 cc="$bytecc -O $bytecclinkopts"
 export cc cclibs verbose
 
@@ -1207,6 +1209,7 @@
   if test -f $dir/libX11.a || \
      test -f $dir/libX11.so || \
      test -f $dir/libX11.dll.a || \
+     test -f $dir/libX11.dylib || \
      test -f $dir/libX11.sa; then
     if test $dir = /usr/lib; then
       x11_link="-lX11"
diff -Nurd -x'*~' ocaml-3.08.0.orig/infoman/ocaml.info ocaml-3.08.0/infoman/ocaml.info
--- ocaml-3.08.0.orig/infoman/ocaml.info	2004-07-13 07:27:03.000000000 -0400
+++ ocaml-3.08.0/infoman/ocaml.info	2005-10-11 01:48:20.000000000 -0400
@@ -1,4 +1,10 @@
 This file has been translated from LaTeX by HeVeA.
+
+INFO-DIR-SECTION Programming Languages
+START-INFO-DIR-ENTRY
+* ocaml: (ocaml).               The Objective Caml compiler and programming environment
+END-INFO-DIR-ENTRY
+
 
 Indirect:
 ocaml.info-1: 51