From 56ba53113c03907a3d4e0528b14ff5c5ffcc9b61 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Fri, 16 Jul 2004 21:04:34 +0000
Subject: Mise en place mécanisme de compatibilité ocaml 3.08

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5929 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 config/Makefile.template | 3 +++
 configure                | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/Makefile.template b/config/Makefile.template
index 3970fd7383..cd49db893c 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -37,6 +37,9 @@ VERSION=COQVERSION
 # Directory containing Camlp4 binaries. Can be empty if camlp4 is in the PATH
 CAMLP4BIN=CAMLP4BINDIRECTORY
 
+# Ocaml version number
+CAMLVERSION=CAMLTAG
+
 # Camlp4 library directory (avoid CAMLP4LIB used on Windows)
 CAMLP4O=CAMLP4TOOL
 MYCAMLP4LIB=CAMLP4LIBDIRECTORY
diff --git a/configure b/configure
index e3bd37bc2d..1a47f1b502 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@
 # 
 ##################################
 
-VERSION=8.0
+VERSION=8.0cvs
 DATE="Apr 2004"
 
 # a local which command for sh
@@ -305,6 +305,8 @@ case $CAMLVERSION in
      exit 1;;
 esac
 
+CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"`
+
 # do we have a native compiler: test of ocamlopt and its version
 
 if [ "$best_compiler" = "opt" ] ; then
@@ -496,6 +498,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \
     -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \
     -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \
+    -e "s|CAMLTAG|$CAMLTAG|" \
     -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \
     -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \
     -e "s|CAMLP4TOOL|$camlp4o|" \
-- 
cgit v1.2.3