Bug 542767 - Port |Bug 477170 - Removing Windows 95 in configure.in| to comm-central; (Av1) Just remove it.
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 29 Jan 2010 01:08:06 +0100
changeset 4778 bb700c852c4f76243a4747a760b3d83656fe9db0
parent 4777 6bff80bb6dcdc363fd35e4f954a9cb96ca02aef4
child 4779 0fc372e315d1598323d10a00c844a2ea477e0eaf
push idunknown
push userunknown
push dateunknown
bugs542767, 477170
Bug 542767 - Port |Bug 477170 - Removing Windows 95 in configure.in| to comm-central; (Av1) Just remove it. r=Callek.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -1191,54 +1191,21 @@ OS_TEST="${target_cpu}"
 
 HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
 
 #######################################################################
 # Master "Core Components" macros for getting the OS target           #
 #######################################################################
 
 #
-# Note: OS_TARGET should be specified on the command line for gmake.
-# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built.
-# The difference between the Win95 target and the WinNT target is that
-# the WinNT target uses Windows NT specific features not available
-# in Windows 95. The Win95 target will run on Windows NT, but (supposedly)
-# at lesser performance (the Win95 target uses threads; the WinNT target
-# uses fibers).
-#
 # If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no
 # cross-compilation.
 #
 
 #
-# The following hack allows one to build on a WIN95 machine (as if
-# s/he were cross-compiling on a WINNT host for a WIN95 target).
-# It also accomodates for MKS's uname.exe.  If you never intend
-# to do development on a WIN95 machine, you don't need this hack.
-#
-case "$OS_ARCH" in
-WIN95)
-    OS_ARCH=WINNT
-    OS_TARGET=WIN95
-    ;;
-Windows_95)
-    OS_ARCH=Windows_NT
-    OS_TARGET=WIN95
-    ;;
-Windows_98)
-    OS_ARCH=Windows_NT
-    OS_TARGET=WIN95
-    ;;
-CYGWIN_9*|CYGWIN_ME*)
-    OS_ARCH='CYGWIN_NT-4.0'
-    OS_TARGET=WIN95
-    ;;
-esac
-
-#
 # Define and override various archtecture-specific variables, including
 # HOST_OS_ARCH
 # OS_ARCH
 # OS_TEST
 # OS_TARGET
 # OS_RELEASE
 # OS_MINOR_RELEASE
 #
@@ -1472,19 +1439,16 @@ sun4u | sparc*)
 x86_64 | ia64)
     CPU_ARCH="$OS_TEST"
     ;;
 esac
 
 if test -z "$OS_TARGET"; then
     OS_TARGET=$OS_ARCH
 fi
-if test "$OS_TARGET" = "WIN95"; then
-    OS_RELEASE="4.0"
-fi
 OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
 
 dnl ========================================================
 dnl GNU specific defaults
 dnl ========================================================
 if test "$GNU_CC"; then
     # FIXME: Let us build with strict aliasing. bug 414641.
     CFLAGS="$CFLAGS -fno-strict-aliasing"