Port from 8.4 branch some build fixes concerning win32 :

 r15722:
   - CAMLBIN was cygwin-specific, leading to issues with coqmktop
   - A missing Filename.quote on the temp file used in coqmktop
   - Try to shorten the cmdline passed to Sys.command in coqmktop:
     way too many includes were passed to coqmktop -boot

 r15724: Coqmktop: the +compiler-libs for ocaml4 is back
 r15725: Coqmktop: better detection of ocaml 4 and above
 r15739: ocamlbuild : a missing include for camlp4

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

1 files changed, 7 insertions, 7 deletions

diff --git a/configure b/configure
index 015a794c3..3db167273 100755
--- a/configure
+++ b/configure
@@ -741,13 +741,15 @@ fi
 ###########################################
 # bindir, libdir, mandir, docdir, etc.
 
-case $src_spec in
-  no) COQTOP=${COQSRC}
-esac
-
 # OCaml only understand Windows filenames (C:\...)
 case $ARCH in
-    win32) COQTOP=`mk_win_path "$COQTOP"`
+    win32) COQSRC=`mk_win_path "$COQSRC"`
+	   CAMLBIN=`mk_win_path "$CAMLBIN"`
+	   CAMLP4BIN=`mk_win_path "$CAMLP4BIN"`
+esac
+
+case $src_spec in
+  no) COQTOP=${COQSRC}
 esac
 
 case $ARCH$CYGWIN in
@@ -1011,8 +1013,6 @@ BROWSER=`escape_string "$BROWSER"`
 
 case $ARCH in
     win32)
-	COQSRC=`mk_win_path "$COQSRC"`
-
 	COQTOP=`escape_string "$COQTOP"`
 	BINDIR=`escape_string "$BINDIR"`
 	COQSRC=`escape_string "$COQSRC"`