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
This commit is contained in:
seawood%netscape.com 2001-12-02 22:16:28 +00:00
parent c4830d7b48
commit 98711ccbcd
4 changed files with 15 additions and 30 deletions

View File

@ -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

View File

@ -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.

14
nsprpub/configure vendored
View File

@ -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
;;
*)

View File

@ -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
;;
*)