diff --git a/configure.in b/configure.in index 1f5e367aff1..401b9643711 100644 --- a/configure.in +++ b/configure.in @@ -1352,36 +1352,9 @@ solaris*) BSD_386) HOST_OS_ARCH=BSD ;; -dgux) - HOST_OS_ARCH=DGUX - ;; -UNIX_SV) - if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then - HOST_OS_ARCH=NCR - else - HOST_OS_ARCH=UNIXWARE - fi - ;; -ncr) - HOST_OS_ARCH=NCR - ;; -UNIX_SYSTEM_V) - HOST_OS_ARCH=NEC - ;; -OSF1) - ;; OS_2) HOST_OS_ARCH=OS2 ;; -SCO_SV) - HOST_OS_ARCH=SCOOS - ;; -SINIX-N | SINIX-Y | SINIX-Z |ReliantUNIX-M) - HOST_OS_ARCH=SINIX - ;; -UnixWare) - HOST_OS_ARCH=UNIXWARE - ;; esac case "$OS_ARCH" in @@ -1423,53 +1396,11 @@ AIX) BSD_386) OS_ARCH=BSD ;; -dgux) - OS_ARCH=DGUX - ;; -UNIX_SV) - if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then - OS_ARCH=NCR - else - OS_ARCH=UNIXWARE - OS_RELEASE=`uname -v` - fi - ;; -ncr) - OS_ARCH=NCR - ;; -UNIX_SYSTEM_V) - OS_ARCH=NEC - ;; -OSF1) - case `uname -v` in - 148) - OS_RELEASE=V3.2C - ;; - 564) - OS_RELEASE=V4.0B - ;; - 878) - OS_RELEASE=V4.0D - ;; - esac - ;; OS_2) OS_ARCH=OS2 OS_TARGET=OS2 OS_RELEASE=`uname -v` ;; -SCO_SV) - OS_ARCH=SCOOS - OS_RELEASE=5.0 - ;; -SINIX-N | SINIX-Y | SINIX-Z |ReliantUNIX-M) - OS_ARCH=SINIX - OS_TEST=`uname -p` - ;; -UnixWare) - OS_ARCH=UNIXWARE - OS_RELEASE=`uname -v` - ;; Darwin) case "${target_cpu}" in powerpc*) @@ -1490,12 +1421,6 @@ Darwin) ;; esac -if test "$OS_ARCH" = "NCR"; then - changequote(,) - OS_RELEASE=`awk '{print $3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$/\2.\3/'` - changequote([,]) -fi - # Only set CPU_ARCH if we recognize the value of OS_TEST case "$OS_TEST" in @@ -2566,15 +2491,6 @@ alpha*-*-osf*) AC_DEFINE(NEED_USLEEP_PROTOTYPE) ;; -*-sco*) - AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES) - AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES) - CXXFLAGS="$CXXFLAGS -I/usr/include/CC" - if test ! "$GNU_CC"; then - DSO_LDOPTS='-G' - fi - ;; - *-solaris*) AC_DEFINE(SOLARIS) TARGET_NSPR_MDCPUCFG='\"md/_solaris.cfg\"' @@ -2674,10 +2590,6 @@ alpha*-*-osf*) esac ;; -*-sysv4.2uw7*) - NSPR_LIBS="-lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION -L/usr/ccs/lib -lcrt" - ;; - *-os2*) HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"' ;; @@ -2735,9 +2647,6 @@ case "$target" in fi fi ;; - *-nto*) - MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' - ;; *-darwin*) MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list' ;; @@ -3505,10 +3414,6 @@ then AC_DEFINE(_REENTRANT) ;; - *-*-nto*) - AC_DEFINE(_REENTRANT) - ;; - *-aix4.3*|*-aix5*) AC_DEFINE(_REENTRANT) ;; diff --git a/js/src/configure.in b/js/src/configure.in index 06c1484a09b..5802c4fc6f1 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1333,36 +1333,9 @@ solaris*) BSD_386) HOST_OS_ARCH=BSD ;; -dgux) - HOST_OS_ARCH=DGUX - ;; -UNIX_SV) - if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then - HOST_OS_ARCH=NCR - else - HOST_OS_ARCH=UNIXWARE - fi - ;; -ncr) - HOST_OS_ARCH=NCR - ;; -UNIX_SYSTEM_V) - HOST_OS_ARCH=NEC - ;; -OSF1) - ;; OS_2) HOST_OS_ARCH=OS2 ;; -SCO_SV) - HOST_OS_ARCH=SCOOS - ;; -SINIX-N | SINIX-Y | SINIX-Z |ReliantUNIX-M) - HOST_OS_ARCH=SINIX - ;; -UnixWare) - HOST_OS_ARCH=UNIXWARE - ;; esac case "$OS_ARCH" in @@ -1409,53 +1382,11 @@ AIX) BSD_386) OS_ARCH=BSD ;; -dgux) - OS_ARCH=DGUX - ;; -UNIX_SV) - if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then - OS_ARCH=NCR - else - OS_ARCH=UNIXWARE - OS_RELEASE=`uname -v` - fi - ;; -ncr) - OS_ARCH=NCR - ;; -UNIX_SYSTEM_V) - OS_ARCH=NEC - ;; -OSF1) - case `uname -v` in - 148) - OS_RELEASE=V3.2C - ;; - 564) - OS_RELEASE=V4.0B - ;; - 878) - OS_RELEASE=V4.0D - ;; - esac - ;; OS_2) OS_ARCH=OS2 OS_TARGET=OS2 OS_RELEASE=`uname -v` ;; -SCO_SV) - OS_ARCH=SCOOS - OS_RELEASE=5.0 - ;; -SINIX-N | SINIX-Y | SINIX-Z |ReliantUNIX-M) - OS_ARCH=SINIX - OS_TEST=`uname -p` - ;; -UnixWare) - OS_ARCH=UNIXWARE - OS_RELEASE=`uname -v` - ;; Darwin) case "${target_cpu}" in powerpc*) @@ -1476,12 +1407,6 @@ Darwin) ;; esac -if test "$OS_ARCH" = "NCR"; then - changequote(,) - OS_RELEASE=`awk '{print $3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$/\2.\3/'` - changequote([,]) -fi - # Only set CPU_ARCH if we recognize the value of OS_TEST case "$OS_TEST" in @@ -2472,15 +2397,6 @@ alpha*-*-osf*) AC_DEFINE(NEED_USLEEP_PROTOTYPE) ;; -*-sco*) - AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES) - AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES) - CXXFLAGS="$CXXFLAGS -I/usr/include/CC" - if test ! "$GNU_CC"; then - DSO_LDOPTS='-G' - fi - ;; - *-solaris*) AC_DEFINE(SOLARIS) TARGET_NSPR_MDCPUCFG='\"md/_solaris.cfg\"' @@ -2585,10 +2501,6 @@ alpha*-*-osf*) esac ;; -*-sysv4.2uw7*) - NSPR_LIBS="-lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION -L/usr/ccs/lib -lcrt" - ;; - *-os2*) HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"' ;; @@ -2645,9 +2557,6 @@ case "$target" in fi fi ;; - *-nto*) - MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' - ;; *-darwin*) MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list' ;; @@ -3402,10 +3311,6 @@ then AC_DEFINE(_REENTRANT) ;; - *-*-nto*) - AC_DEFINE(_REENTRANT) - ;; - *-aix4.3*|*-aix5*) AC_DEFINE(_REENTRANT) ;;