Detection de l'architecture sous Windows (et sans uname -o)

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

1 files changed, 9 insertions, 3 deletions

diff --git a/configure b/configure
index 04d89cba6..80e311e55 100755
--- a/configure
+++ b/configure
@@ -229,6 +229,11 @@ esac
 
 case $arch_spec in
     no) 
+    # First we test if we are running a Cygwin system
+    if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then
+	ARCH="win32"
+    else
+	# If not, we determine the architecture
 	if test -x /bin/arch ; then
  	    ARCH=`/bin/arch`
  	elif test -x /usr/bin/arch ; then
@@ -236,15 +241,16 @@ case $arch_spec in
  	elif test -x /usr/ucb/arch ; then
  	    ARCH=`/usr/ucb/arch`
  	elif test -x /bin/uname ; then
- 	    ARCH=`/bin/uname -s | sed -e 's/CYGWIN.*/win32/'`
+ 	    ARCH=`/bin/uname -s`
  	elif test -x /usr/bin/uname ; then
- 	    ARCH=`/usr/bin/uname -s | sed -e 's/CYGWIN.*/win32/'`
+ 	    ARCH=`/usr/bin/uname -s`
 	else
 	    echo "I can not automatically find the name of your architecture"
 	    echo -n\
 		"Give me a name, please [win32 for Win95, Win98 or WinNT]: "
 	    read ARCH
-	fi;;
+	fi
+    fi;;
     yes) ARCH=$arch
 esac