From b3983a99c4b13b7c9bf9bf2f1b2fce123a6cf3d1 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jun 15 2012 21:49:12 +0000
Subject: Fix configure conditionals that don't know about OCaml 4.00.0.


---

diff --git a/coq-camlp5.patch b/coq-camlp5.patch
index f1ddc78..7dc4195 100644
--- a/coq-camlp5.patch
+++ b/coq-camlp5.patch
@@ -1,11 +1,39 @@
---- scripts/coqmktop.ml.orig	2011-11-06 04:59:10.000000000 -0700
-+++ scripts/coqmktop.ml	2012-06-14 15:32:08.307676865 -0600
-@@ -274,7 +274,7 @@
+--- ./scripts/coqmktop.ml.orig	2011-11-06 04:59:10.000000000 -0700
++++ ./scripts/coqmktop.ml	2012-06-15 14:38:09.600706944 -0600
+@@ -63,6 +63,7 @@ let includes () =
+       (src_dirs ())
+       (["-I"; "\"" ^ camlp4lib ^ "\""] @
+ 	 ["-I"; "\"" ^ coqlib ^ "\""] @
++	 ["-I"; "+compiler-libs"] @
+ 	 (if !coqide then ["-thread"; "-I"; "+lablgtk2"] else []))
+ 
+ (* Transform bytecode object file names in native object file names *)
+@@ -274,7 +275,7 @@ let main () =
          ocamloptexec^" -linkall"
      end else
        (* bytecode (we shunt ocamlmktop script which fails on win32) *)
 -      let ocamlmktoplib = " toplevellib.cma" in
-+      let ocamlmktoplib = " -I +compiler-libs ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma" in
++      let ocamlmktoplib = " ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma" in
        let ocamlcexec = Filename.concat camlbin "ocamlc" in
        let ocamlccustom = Printf.sprintf "%s %s -linkall "
          ocamlcexec Coq_config.coqrunbyteflags in
+--- ./configure.orig	2012-03-26 10:41:59.000000000 -0600
++++ ./configure	2012-06-15 14:34:56.241970501 -0600
+@@ -444,7 +444,7 @@ esac
+ 
+ if [ "$coq_debug_flag" = "-g" ]; then
+     case $CAMLTAG in
+-        OCAML31*)
++        OCAML31*|OCAML4*)
+             # Compilation debug flag
+             coq_debug_flag_opt="-g"
+             ;;
+@@ -494,7 +494,7 @@ if [ "$camlp5dir" != "" ]; then
+     camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
+ else
+     case $CAMLTAG in
+-        OCAML31*)
++        OCAML31*|OCAML4*)
+             if [ -x "${CAMLLIB}/camlp5" ]; then
+                 CAMLP4LIB=+camlp5
+             elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then