diff options
| author | seawood%netscape.com <devnull@localhost> | 2001-12-02 22:16:28 +0000 |
|---|---|---|
| committer | seawood%netscape.com <devnull@localhost> | 2001-12-02 22:16:28 +0000 |
| commit | 30d690fe76a2232c70c5a5161ac35b1e541d3d11 (patch) | |
| tree | 72fd4a385ab98c43b9c4846b9a0f79a51469f015 | |
| parent | ceff9fa42cbd3802bfd8a5d446729b81008fbff9 (diff) | |
| download | nspr-hg-30d690fe76a2232c70c5a5161ac35b1e541d3d11.tar.gz | |
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
| -rwxr-xr-x | build/autoconf/config.guess | 11 | ||||
| -rwxr-xr-x | build/autoconf/config.sub | 6 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.in | 14 |
4 files changed, 15 insertions, 30 deletions
diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess index dc37b18b..627c6158 100755 --- a/build/autoconf/config.guess +++ b/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/build/autoconf/config.sub b/build/autoconf/config.sub index 37799ea8..0cee56fb 100755 --- a/build/autoconf/config.sub +++ b/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. @@ -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/configure.in b/configure.in index 9b2f4880..bf2aa242 100644 --- a/configure.in +++ b/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 ;; *) |