Merge in recent changes from 0.9.6-stable.

1 files changed, 11 insertions, 3 deletions

diff --git a/config b/config
index 6ff1c39e27..8d61cfac55 100755
--- a/config
+++ b/config
@@ -299,7 +299,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	;;
 
     CYGWIN*)
-	echo "${MACHINE}-whatever-cygwin32"; exit 0
+	case "$RELEASE" in
+	    [bB]*|1.0|1.[12].*)
+		echo "${MACHINE}-whatever-cygwin_pre1.3"
+		;;
+	    *)
+		echo "${MACHINE}-whatever-cygwin"
+		;;
+	esac
+	exit 0
 	;;
 
 esac
@@ -581,8 +589,8 @@ EOF
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
-  *-*-cygwin32) OUT="CygWin32"
-		options="$options no-threads no-asm" ;;
+  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+  *-*-cygwin) OUT="Cygwin" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac