From 868ae672f70f7fd6f6c0f91384dcb3a9714997cc Mon Sep 17 00:00:00 2001
From: notin
Date: Thu, 15 Jun 2006 14:06:00 +0000
Subject: Report des modifications faites lors de la 8.0pl3

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@8959 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 configure | 76 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index 2bad64101b..6e08d08b63 100755
--- a/configure
+++ b/configure
@@ -30,6 +30,7 @@ coq_profile_flag=
 best_compiler=opt
 
 local=false
+src_spec=no
 bindir_spec=no
 libdir_spec=no
 mandir_spec=no
@@ -44,7 +45,7 @@ arch_spec=no
 coqide_spec=no
 with_geoproof=true
 
-COQTOP=`pwd`
+# COQTOP=`pwd`
 
 
 # Parse command-line arguments
@@ -76,25 +77,26 @@ while : ; do
 		    fsets=all
 		    reals_opt=yes
 		    reals=all;;
-    -src|--src) COQTOP=$2
+    -src|--src) src_spec=yes
+	        COQTOP="$2"
 	        shift;;
     -bindir|--bindir) bindir_spec=yes
                       bindir=$2
 		      shift;;
     -libdir|--libdir) libdir_spec=yes
-                      libdir=$2
+                      libdir="$2"
 		      shift;;
     -mandir|--mandir) mandir_spec=yes
-                      mandir=$2
+                      mandir="$2"
 		      shift;;
     -emacslib|--emacslib) emacslib_spec=yes
-                          emacslib=$2
+                          emacslib="$2"
 			  shift;;
     -emacs |--emacs) emacs_spec=yes
-		     emacs=$2
+		     emacs="$2"
 		     shift;;
     -coqdocdir|--coqdocdir) coqdocdir_spec=yes
-	              coqdocdir=$2
+	              coqdocdir="$2"
 		      shift;;
     -arch|--arch) arch_spec=yes
                   arch=$2
@@ -162,6 +164,19 @@ esac
 
 # bindir, libdir, mandir, etc.
 
+###########################################
+# bindir, libdir, mandir, etc.
+
+canonical_pwd () {
+ocaml 2>&1 1>/dev/null <<EOF
+  prerr_endline(Sys.getcwd());;
+EOF
+}
+
+case $src_spec in
+  no) COQTOP=`canonical_pwd`
+esac
+
 case $ARCH in
   win32)
 	 bindir_def=C:\\coq\\bin
@@ -291,6 +306,20 @@ case $ARCH in
     *) EXE=""
 esac
 
+# strip command
+
+case $ARCH in
+    win32)
+	# true -> strip : it exists under cygwin !
+	STRIPCOMMAND="strip";; 
+    *)
+    if [ "$coq_profile_flag" = "-p" ] ; then
+	STRIPCOMMAND="true"
+    else
+	STRIPCOMMAND="strip"
+    fi
+esac
+
 # Objective Caml programs
 
 CAMLC=`which $bytecamlc`
@@ -522,29 +551,40 @@ rm -f $COQTOP/config/Makefile
 # damned backslashes under M$Windows (bis)
 case $ARCH in
     win32)
-	BINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'`
-	LIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'`
-  	MANDIR=`echo $MANDIR |sed -e 's|\\\|\\\\\\\|g'`
-   	EMACSLIB=`echo $EMACSLIB |sed -e 's|\\\|\\\\\\\|g'`
+	ESCCOQTOP=`echo $COQTOP |sed -e 's|\\\|\\\\\\\|g'`
+	ESCBINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'`
+	ESCLIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'`
+  	ESCMANDIR=`echo $MANDIR |sed -e 's|\\\|\\\\\\\|g'`
+   	ESCEMACSLIB=`echo $EMACSLIB |sed -e 's|\\\|\\\\\\\|g'`
+   	ESCCOQDOCDIR=`echo $COQDOCDIR |sed -e 's|\\\|\\\\\\\|g'`
+   	ESCCAMLP4BIN=`echo $CAMLP4BIN |sed -e 's|\\\|\\\\\\\|g'`
 	;;
+    *)
+        ESCCOQTOP="$COQTOP"
+	ESCBINDIR="$BINDIR"
+	ESCLIBDIR="$LIBDIR"
+  	ESCMANDIR="$MANDIR"
+   	ESCEMACSLIB="$EMACSLIB"
+   	ESCCOQDOCDIR="$COQDOCDIR"
+   	ESCCAMLP4BIN="$CAMLP4BIN" ;;
 esac
 
 sed -e "s|LOCALINSTALLATION|$local|" \
-    -e "s|COQTOPDIRECTORY|$COQTOP|" \
+    -e "s|COQTOPDIRECTORY|$ESCCOQTOP|" \
     -e "s|COQVERSION|$VERSION|" \
-    -e "s|BINDIRDIRECTORY|$BINDIR|" \
-    -e "s|COQLIBDIRECTORY|$LIBDIR|" \
-    -e "s|MANDIRDIRECTORY|$MANDIR|" \
-    -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \
+    -e "s|BINDIRDIRECTORY|$ESCBINDIR|" \
+    -e "s|COQLIBDIRECTORY|$ESCLIBDIR|" \
+    -e "s|MANDIRDIRECTORY|$ESCMANDIR|" \
+    -e "s|EMACSLIBDIRECTORY|$ESCEMACSLIB|" \
     -e "s|EMACSCOMMAND|$EMACS|" \
-    -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \
+    -e "s|COQDOCDIRECTORY|$ESCCOQDOCDIR|" \
     -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \
     -e "s|ARCHITECTURE|$ARCH|" \
     -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \
     -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \
     -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \
     -e "s|CAMLTAG|$CAMLTAG|" \
-    -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \
+    -e "s|CAMLP4BINDIRECTORY|$ESCCAMLP4BIN|" \
     -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \
     -e "s|CAMLP4TOOL|$camlp4o|" \
     -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \
-- 
cgit v1.2.3