update the minimal ocaml version to 4.02

The ocaml safe-strings patch uses code introduced in ocaml 4.02
so update the minimal version.

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
Acked-by: Christian Lindig <christian.lindig@citrix.com>

diff --git a/stubdom/configure b/stubdom/configure
index a7a0c0915440b7b351a7adf4f40c8f9ee8e739ef..abb749faed3aca6563953a0d3a77d824f37f17d6 100755 (executable)
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -3528,10 +3528,10 @@ GRUB_VERSION="0.97"
 
 if test "x$OCAML_URL" = "x"; then :
 
-       OCAML_URL="http://caml.inria.fr/pub/distrib/ocaml-3.11"
+       OCAML_URL="http://caml.inria.fr/pub/distrib/ocaml-4.02"
 
 fi
-OCAML_VERSION="3.11.0"
+OCAML_VERSION="4.02.0"
 
 
 

diff --git a/stubdom/configure.ac b/stubdom/configure.ac
index 9fec8539d273b37dec301d4aaabef4429d5bec39..9066dfaaa7fea4456b594294918fafa3345ec23d 100644 (file)
--- a/stubdom/configure.ac
+++ b/stubdom/configure.ac
@@ -65,7 +65,7 @@ AX_STUBDOM_LIB([LIBPCI], [libpci], [2.2.9], [http://www.kernel.org/pub/software/
 AX_STUBDOM_LIB([NEWLIB], [newlib], [1.16.0], [ftp://sources.redhat.com/pub/newlib])
 AX_STUBDOM_LIB([LWIP], [lwip], [1.3.0], [http://download.savannah.gnu.org/releases/lwip])
 AX_STUBDOM_LIB([GRUB], [grub], [0.97], [http://alpha.gnu.org/gnu/grub])
-AX_STUBDOM_LIB_NOEXT([OCAML], [ocaml], [3.11.0], [http://caml.inria.fr/pub/distrib/ocaml-3.11])
+AX_STUBDOM_LIB_NOEXT([OCAML], [ocaml], [4.02.0], [http://caml.inria.fr/pub/distrib/ocaml-4.02])
 AX_STUBDOM_LIB([GMP], [libgmp], [4.3.2], [ftp://ftp.gmplib.org/pub/gmp-4.3.2])
 AX_STUBDOM_LIB([POLARSSL], [polarssl], [1.1.4], [http://polarssl.org/code/releases])
 AX_STUBDOM_LIB([TPMEMU], [berlios tpm emulator], [0.7.4], [http://download.berlios.de/tpm-emulator])

diff --git a/tools/configure b/tools/configure
index 05921b4898911fc89a670544cbd59eb34402c244..feb34fc03df72414d998835035c2d431ebf7220c 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -6616,7 +6616,7 @@ else
                      -e 's/[^0-9]//g'`
 
 
-  ax_compare_version_B=`echo "3.09.3" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+  ax_compare_version_B=`echo "4.02.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
                      -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
                      -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
                      -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \

diff --git a/tools/configure.ac b/tools/configure.ac
index d1a3a78d87ce2f077e551c6ee039caad4ad2edc1..06eb16db4fb3e648c5d2f1788b4d4544f7fc1fac 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -294,7 +294,7 @@ AS_IF([test "x$ocamltools" = "xy"], [
             AC_MSG_ERROR([Ocaml tools enabled, but missing ocamlopt or ocamlfind])])
         ocamltools="n"
     ], [
-        AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [3.09.3], [
+        AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [4.02.0], [
             AS_IF([test "x$enable_ocamltools" = "xyes"], [
                 AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported])])
             ocamltools="n"