Compilation sous windows

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10171 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 14 insertions, 5 deletions

diff --git a/configure b/configure
index e330b80b16..f7f0e45383 100755
--- a/configure
+++ b/configure
@@ -85,6 +85,7 @@ coq_debug_flag=
 coq_profile_flag=
 coq_annotate_flag=
 best_compiler=opt
+cflags="-fno-defer-pop -Wall -Wno-unused"
 
 gcc_exec=gcc
 ar_exec=ar
@@ -360,13 +361,19 @@ if [ "$best_compiler" = "opt" ] ; then
   fi
 fi
 
-
 # For coqmktop & bytecode compiler
 
 case $ARCH in
-  win32) # Awful trick to get around ^M character at the end of CAMLLIB
-         CAMLLIB="C:\OCaml\lib";;
-  *) CAMLLIB=`"$CAMLC" -where`
+    win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB
+      CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;;
+    *)
+      CAMLLIB=`"$CAMLC" -where`
+esac
+
+# We need to set va special flag for OCaml 3.07
+case  $CAMLVERSION in 
+	3.07*)
+	  cflags="$cflags -DOCAML_307";;
 esac
 
 # Camlp4 / Camlp5 configuration
@@ -404,7 +411,8 @@ case $ARCH in
         esac;;
   alpha) OSDEPLIBS="-cclib -lunix";;
   win32) OS="Win32" 
-	 OSDEPLIBS="-cclib -lunix";;
+	 OSDEPLIBS="-cclib -lunix"
+	 cflags="-mno-cygwin $cflags";;
   *) OSDEPLIBS="-cclib -lunix"
 esac
 
@@ -732,6 +740,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|COQDEBUGFLAG|$coq_debug_flag|" \
     -e "s|COQPROFILEFLAG|$coq_profile_flag|" \
     -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \
+    -e "s|CCOMPILEFLAGS|$cflags|" \
     -e "s|BESTCOMPILER|$best_compiler|" \
     -e "s|EXECUTEEXTENSION|$EXE|" \
     -e "s|BYTECAMLC|$bytecamlc|" \