Report de la révision 11754 (compilation sous windows)

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

1 files changed, 15 insertions, 8 deletions

diff --git a/configure b/configure
index cea82aaef4..8e44ead7ad 100755
--- a/configure
+++ b/configure
@@ -293,8 +293,11 @@ esac
 # executable extension
 
 case $ARCH in
-    win32) EXE=".exe";;
+    win32) 
+      EXE=".exe"
+      DLLEXT=".dll";;
     *) EXE=""
+       DLLEXT=".so"
 esac
 
 # Is the source tree checked out from a recognised
@@ -380,7 +383,7 @@ case $camldir_spec in
 	 ocamldocexec=$CAMLBIN/ocamldoc
 	 ocamllexexec=$CAMLBIN/ocamllex
 	 ocamlyaccexec=$CAMLBIN/ocamlyacc
-	 camlmktopexec=$CAMLBIN/ocamlmktop
+	 ocamlmktopexec=$CAMLBIN/ocamlmktop
 	 camlp4oexec=$CAMLBIN/camlp4o
 esac
 
@@ -863,6 +866,7 @@ case $ARCH in
 	ESCCOQTOP=`echo $COQTOP |sed -e 's|\\\|\\\\\\\|g'`
 	ESCBINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'`
 	ESCSRCDIR=`echo $COQSRC |sed -e 's|\\\|\\\\\\\|g'`
+	ESCDOSSRCDIR=`cygpath -d $COQSRC |sed -e 's|\\\|\\\\\\\|g'`
 	ESCLIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'`
 	ESCCAMLDIR=`echo $CAMLBIN |sed -e 's|\\\|\\\\\\\|g'`
 	ESCCAMLLIB=`echo $CAMLLIB |sed -e 's|\\\|\\\\\\\|g'`
@@ -873,7 +877,9 @@ case $ARCH in
    	ESCCAMLP4BIN=`echo $CAMLP4BIN |sed -e 's|\\\|\\\\\\\|g'`
 	ESCCAMLP4LIB=`echo $CAMLP4LIB |sed -e 's|\\\|\\\\\\\|g'`
 	ESCLABLGTKINCLUDES=`echo $LABLGTKINCLUDES |sed -e 's|\\\|\\\\\\\|g'`
-	;;
+	ESCCOQRUNBYTEFLAGS=`echo $COQRUNBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'`
+	ESCBUILDLDPATH=`echo $BUILDLDPATH |sed -e 's|\\\|\\\\\\\|g'`
+;;
     *)
         ESCCOQTOP="$COQTOP"
 	ESCBINDIR="$BINDIR"
@@ -897,9 +903,9 @@ cat << END_OF_COQ_CONFIG > $mlconfig_file
 (* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
 
 let local = $local
-let coqrunbyteflags = "$COQRUNBYTEFLAGS"
+let coqrunbyteflags = "$ESCCOQRUNBYTEFLAGS"
 let coqlib = "$ESCLIBDIR"
-let coqsrc = "$ESCSRCDIR"
+let coqsrc = "$ESCDOSSRCDIR"
 let camlbin = "$ESCCAMLDIR"
 let camllib = "$ESCCAMLLIB"
 let camlp4 = "$CAMLP4"
@@ -946,12 +952,12 @@ chmod a-w "$mlconfig_file"
 rm -f "$COQSRC/config/Makefile"
 
 sed -e "s|LOCALINSTALLATION|$local|" \
-    -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \
+    -e "s|XCOQRUNBYTEFLAGS|$ESCCOQRUNBYTEFLAGS|" \
     -e "s|COQSRCDIRECTORY|$COQSRC|" \
     -e "s|COQVERSION|$VERSION|" \
     -e "s|BINDIRDIRECTORY|$ESCBINDIR|" \
     -e "s|COQLIBDIRECTORY|$ESCLIBDIR|" \
-    -e "s|BUILDLDPATH=|$BUILDLDPATH|" \
+    -e "s|BUILDLDPATH=|$ESCBUILDLDPATH|" \
     -e "s|MANDIRDIRECTORY|$ESCMANDIR|" \
     -e "s|DOCDIRDIRECTORY|$ESCDOCDIR|" \
     -e "s|EMACSLIBDIRECTORY|$ESCEMACSLIB|" \
@@ -974,6 +980,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \
     -e "s|CCOMPILEFLAGS|$cflags|" \
     -e "s|BESTCOMPILER|$best_compiler|" \
+    -e "s|DLLEXTENSION|$DLLEXT|" \
     -e "s|EXECUTEEXTENSION|$EXE|" \
     -e "s|BYTECAMLC|$bytecamlc|" \
     -e "s|OCAMLMKLIBEXEC|$ocamlmklib|" \
@@ -983,7 +990,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|OCAMLDOCEXEC|$ocamldocexec|" \
     -e "s|OCAMLLEXEXEC|$ocamllexexec|" \
     -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \
-    -e "s|CAMLMKTOPEXEC|$camlmktopexec|" \
+    -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \
     -e "s|CCEXEC|$gcc_exec|" \
     -e "s|AREXEC|$ar_exec|" \
     -e "s|RANLIBEXEC|$ranlib_exec|" \