From b466be448bc98c31e6eb9c624973d16d31bfd32d Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Sun, 2 Dec 2001 22:16:28 +0000
Subject: [PATCH] Revert to using standard config.sub & config.guess entries
 for OS/2. Thanks to pedemont@us.ibm.com (Javier Pedemonte) for the patch. Bug
 #112244 r=cls

---
 nsprpub/build/autoconf/config.guess | 11 +----------
 nsprpub/build/autoconf/config.sub   |  6 ------
 nsprpub/configure                   | 14 +++++++-------
 nsprpub/configure.in                | 14 +++++++-------
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/nsprpub/build/autoconf/config.guess b/nsprpub/build/autoconf/config.guess
index dc37b18b0fd..627c6158cc1 100755
--- a/nsprpub/build/autoconf/config.guess
+++ b/nsprpub/build/autoconf/config.guess
@@ -1100,16 +1100,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	# echo ${UNAME_MACHINE}-pc-os2-emx
-#### MozillaHack 
- 	if test "$VACPP" = "yes"; then
-		echo "i386-pc-os2_vacpp"
-	else
-		echo "i386-pc-os2_emx"
-	fi
-#### End MozillaHack 
+        echo ${UNAME_MACHINE}-pc-os2-emx
 	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
diff --git a/nsprpub/build/autoconf/config.sub b/nsprpub/build/autoconf/config.sub
index 37799ea81ee..0cee56fb7e2 100755
--- a/nsprpub/build/autoconf/config.sub
+++ b/nsprpub/build/autoconf/config.sub
@@ -1059,12 +1059,6 @@ case $os in
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-#### MozillaHack 
-	-os2_emx)
-		;;
-	-os2_vacpp)
-		;;
-#### End MozillaHack 
 	# First accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST END IN A *, to match a version number.
diff --git a/nsprpub/configure b/nsprpub/configure
index 3f4fdd54163..91f58f174e5 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -4525,8 +4525,8 @@ EOF
     MDCPUCFG_H=_os2.cfg
     RESOLVE_LINK_SYMBOLS=1
 
-    case "$target" in
-    *-os2_emx)
+    # EMX/GCC build
+    if test "$GNU_CC"; then
         cat >> confdefs.h <<\EOF
 #define XP_OS2_EMX 1
 EOF
@@ -4556,8 +4556,10 @@ EOF
           EXEFLAGS='-Zmtd -o $@'
           DSO_LDOPTS='-Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO'
         fi
-        ;;
-    *-os2_vacpp)
+    fi
+    
+    # Visual Age C++ build
+    if test "$VACPP" = "yes"; then
         cat >> confdefs.h <<\EOF
 #define XP_OS2_VACPP 1
 EOF
@@ -4605,9 +4607,7 @@ EOF
         fi
         LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-        ;;
-    esac
-
+    fi
     ;;
 
 *)
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 9b2f488068e..bf2aa242df8 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1689,8 +1689,8 @@ mips-sony-newsos*)
     MDCPUCFG_H=_os2.cfg
     RESOLVE_LINK_SYMBOLS=1
 
-    case "$target" in
-    *-os2_emx)
+    # EMX/GCC build
+    if test "$GNU_CC"; then
         AC_DEFINE(XP_OS2_EMX)
         AC_DEFINE(OS2)
         AR=emxomfar
@@ -1714,8 +1714,10 @@ mips-sony-newsos*)
           EXEFLAGS='-Zmtd -o $@'
           DSO_LDOPTS='-Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO'
         fi
-        ;;
-    *-os2_vacpp)
+    fi
+    
+    # Visual Age C++ build
+    if test "$VACPP" = "yes"; then
         AC_DEFINE(XP_OS2_VACPP)
         AC_DEFINE(OS2,4)
         AC_DEFINE(TCPV40HDRS)
@@ -1751,9 +1753,7 @@ mips-sony-newsos*)
         fi
         LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
-        ;;
-    esac
-
+    fi
     ;;
 
 *)