From 4f7f0766bfd731d5e89432b5992ecebb38adec54 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Mon, 29 Nov 1999 02:15:22 +0000
Subject: [PATCH] Fixed tabbing problems with emacs caused by the mode header.
 Added preliminary autoconf support for aix, dgux, freebsd and hpux.  All
 untested.

---
 nsprpub/config/autoconf.mk.in |   9 +-
 nsprpub/configure             | 939 ++++++++++++++++++++++++----------
 nsprpub/configure.in          | 560 +++++++++++++-------
 3 files changed, 1053 insertions(+), 455 deletions(-)

diff --git a/nsprpub/config/autoconf.mk.in b/nsprpub/config/autoconf.mk.in
index 08d44021862..ccb334a8eda 100644
--- a/nsprpub/config/autoconf.mk.in
+++ b/nsprpub/config/autoconf.mk.in
@@ -29,13 +29,17 @@ RANLIB		= @RANLIB@
 PERL		= @PERL@
 DLLTOOL		= @DLLTOOL@
 WINDRES		= @WINDRES@
-MKSHLIB		= @MKSHLIB@
 RC		= $(WINDRES)
 
 OS_CFLAGS	= @CFLAGS@
 OS_CXXFLAGS	= @CXXFLAGS@
 OS_LIBS         = @OS_LIBS@
 
+MKSHLIB		= @MKSHLIB@
+DSO_CFLAGS	= @DSO_CFLAGS@
+DSO_LDOPTS	= @DSO_LDOPTS@
+DSO_LDFLAGS	= @DSO_LDFLAGS@
+
 EXTRA_LIBS      = @EXTRA_LIBS@
 
 HOST_CC		= @HOST_CC@
@@ -49,3 +53,6 @@ PR_MD_CSRCS	= @PR_MD_CSRCS@
 PR_MD_ASFILES	= @PR_MD_ASFILES@
 PR_MD_ARCH_DIR	= @PR_MD_ARCH_DIR@
 
+NOSUCHFILE	= @NOSUCHFILE@
+AIX_LINK_OPTS	= @AIX_LINK_OPTS@
+MOZ_OBJFORMAT	= @MOZ_OBJFORMAT@
diff --git a/nsprpub/configure b/nsprpub/configure
index fe54408ab3f..93a5606a37c 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -12,6 +12,8 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_default_prefix=\${MOD_DEPTH}/dist
+ac_help="$ac_help
+  --with-mozilla          Compile NSPR with Mozilla support"
 ac_help="$ac_help
   --enable-optimize       Enable code optimizations"
 ac_help="$ac_help
@@ -26,8 +28,6 @@ ac_help="$ac_help
   --enable-64bit          Enable 64-bit support (on certain platforms)"
 ac_help="$ac_help
   --enable-mdupdate       Enable use of certain compilers' mdupdate feature"
-ac_help="$ac_help
-  --with-mozilla          Compile NSPR with Mozilla support"
 ac_help="$ac_help
   --with-pthreads         Use system pthreads library as thread subsystem"
 ac_help="$ac_help
@@ -701,6 +701,8 @@ USE_USER_PTHREADS=
 USE_NSPR_THREADS=
 USE_N32=
 USE_64=
+USE_CPLUS=
+USE_IPV6=
 USE_MDUPDATE=
 _OPTIMIZE_FLAGS=-O
 _DEBUG_FLAGS=-g
@@ -713,6 +715,28 @@ LDFLAGS="${LDFLAGS=}"
 HOST_CFLAGS="${HOST_CFLAGS=}"
 HOST_LDFLAGS="${HOST_LDFLAGS=}"
 
+# Check whether --with-mozilla or --without-mozilla was given.
+if test "${with_mozilla+set}" = set; then
+  withval="$with_mozilla"
+     if test "$withval" = "yes"; then
+            cat >> confdefs.h <<\EOF
+#define MOZILLA_CLIENT 1
+EOF
+
+            MOZILLA_CLIENT=1
+	    else
+	        MOZILLA_CLIENT=
+	    fi
+else
+  	if test -n "$MOZILLA_CLIENT"; then
+	        cat >> confdefs.h <<\EOF
+#define MOZILLA_CLIENT 1
+EOF
+
+	    fi
+fi
+
+
 # Check whether --enable-optimize or --disable-optimize was given.
 if test "${enable_optimize+set}" = set; then
   enableval="$enable_optimize"
@@ -725,7 +749,7 @@ if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
   	if test "$enableval" = "no"; then
     	    MOZ_DEBUG=
-	fi
+	    fi
 fi
 
 
@@ -758,8 +782,8 @@ fi
 if test "${enable_64bit+set}" = set; then
   enableval="$enable_64bit"
    if test "$enableval" = "yes"; then
-	USE_64=1
-    fi 
+	    USE_64=1
+      fi 
 fi
 
 
@@ -767,15 +791,15 @@ fi
 if test "${enable_mdupdate+set}" = set; then
   enableval="$enable_mdupdate"
    if test "$enableval" = "yes"; then
-	USE_MDUPDATE=1
-    fi 
+	    USE_MDUPDATE=1
+      fi 
 fi
 
 
 # Extract the first word of "whoami", so it can be a program name with args.
 set dummy whoami; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:779: checking for $ac_word" >&5
+echo "configure:803: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -835,14 +859,14 @@ if test "$target" != "$host"; then
     _SAVE_LDFLAGS="$LDFLAGS"
 
     echo $ac_n "checking for $host compiler""... $ac_c" 1>&6
-echo "configure:839: checking for $host compiler" >&5
+echo "configure:863: checking for $host compiler" >&5
     if test -z "$HOST_CC"; then
-	for ac_prog in gcc cc /usr/ucb/cc
+	    for ac_prog in gcc cc /usr/ucb/cc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:846: checking for $ac_word" >&5
+echo "configure:870: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -872,16 +896,16 @@ test -n "$HOST_CC" && break
 done
 test -n "$HOST_CC" || HOST_CC=""""
 
-	if test -z "$HOST_CC"; then
-	    { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-	fi
+	    if test -z "$HOST_CC"; then
+	        { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+	    fi
     fi
     echo "$ac_t""$HOST_CC" 1>&6
     if test -z "$HOST_CFLAGS"; then
-	HOST_CFLAGS="$CFLAGS"
+	    HOST_CFLAGS="$CFLAGS"
     fi
     if test -z "$HOST_LDFLAGS"; then
-	HOST_LDFLAGS="$LDFLAGS"
+	    HOST_LDFLAGS="$LDFLAGS"
     fi
 
     CC="$HOST_CC"
@@ -889,16 +913,16 @@ test -n "$HOST_CC" || HOST_CC=""""
     LDFLAGS="$HOST_LDFLAGS"
 
     echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:893: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:917: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
     cat > conftest.$ac_ext <<EOF
-#line 895 "configure"
+#line 919 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6
 else
@@ -914,12 +938,12 @@ rm -f conftest*
     LDFLAGS=$_SAVE_LDFLAGS
 
     if test -z "$CC"; then
-	for ac_prog in "${target_alias}-gcc" "${target}-gcc"
+	    for ac_prog in "${target_alias}-gcc" "${target}-gcc"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:923: checking for $ac_word" >&5
+echo "configure:947: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -954,7 +978,7 @@ test -n "$CC" || CC=":"
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:958: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -984,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:988: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1035,7 +1059,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1039: checking for $ac_word" >&5
+echo "configure:1063: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1067,7 +1091,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1071: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1095: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1078,12 +1102,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1082 "configure"
+#line 1106 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1109,12 +1133,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1113: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1137: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1118: checking whether we are using GNU C" >&5
+echo "configure:1142: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1123,7 +1147,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1142,7 +1166,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1146: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1170: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1174,12 +1198,12 @@ else
 fi
 
     if test -z "$CXX"; then
-	for ac_prog in "${target_alias}-g++" "${target}-g++"
+	    for ac_prog in "${target_alias}-g++" "${target}-g++"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1183: checking for $ac_word" >&5
+echo "configure:1207: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1216,7 +1240,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1220: checking for $ac_word" >&5
+echo "configure:1244: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1248,7 +1272,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1252: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1276: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1259,12 +1283,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1263 "configure"
+#line 1287 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1290,12 +1314,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1294: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1318: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1299: checking whether we are using GNU C++" >&5
+echo "configure:1323: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1304,7 +1328,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1323,7 +1347,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1327: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1351: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1355,12 +1379,12 @@ else
 fi
 
     if test -z "$RANLIB"; then
-	for ac_prog in "${target_alias}-ranlib" "${target}-ranlib"
+	    for ac_prog in "${target_alias}-ranlib" "${target}-ranlib"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1364: checking for $ac_word" >&5
+echo "configure:1388: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1392,12 +1416,12 @@ test -n "$RANLIB" || RANLIB=":"
 
     fi
     if test -z "$AR"; then
-	for ac_prog in "${target_alias}-ar" "${target}-ar"
+	    for ac_prog in "${target_alias}-ar" "${target}-ar"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1401: checking for $ac_word" >&5
+echo "configure:1425: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1429,12 +1453,12 @@ test -n "$AR" || AR=":"
 
     fi
     if test -z "$AS"; then
-	for ac_prog in "${target_alias}-as" "${target}-as"
+	    for ac_prog in "${target_alias}-as" "${target}-as"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1438: checking for $ac_word" >&5
+echo "configure:1462: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1466,12 +1490,12 @@ test -n "$AS" || AS=":"
 
     fi
     if test -z "$DLLTOOL"; then
-	for ac_prog in "${target_alias}-dlltool" "${target}-dlltool"
+	    for ac_prog in "${target_alias}-dlltool" "${target}-dlltool"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1475: checking for $ac_word" >&5
+echo "configure:1499: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1503,12 +1527,12 @@ test -n "$DLLTOOL" || DLLTOOL=":"
 
     fi
     if test -z "$WINDRES"; then
-	for ac_prog in "${target_alias}-windres" "${target}-windres"
+	    for ac_prog in "${target_alias}-windres" "${target}-windres"
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1512: checking for $ac_word" >&5
+echo "configure:1536: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1543,7 +1567,7 @@ else
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1547: checking for $ac_word" >&5
+echo "configure:1571: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1573,7 +1597,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1577: checking for $ac_word" >&5
+echo "configure:1601: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1624,7 +1648,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1628: checking for $ac_word" >&5
+echo "configure:1652: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1656,7 +1680,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1660: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1684: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1667,12 +1691,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1671 "configure"
+#line 1695 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1698,12 +1722,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1702: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1726: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1707: checking whether we are using GNU C" >&5
+echo "configure:1731: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1712,7 +1736,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1731,7 +1755,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1735: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1759: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1767,7 +1791,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1771: checking for $ac_word" >&5
+echo "configure:1795: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1799,7 +1823,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1803: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1827: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1810,12 +1834,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1814 "configure"
+#line 1838 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1841,12 +1865,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1845: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1869: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1850: checking whether we are using GNU C++" >&5
+echo "configure:1874: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1855,7 +1879,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1874,7 +1898,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1878: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1902: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1908,7 +1932,7 @@ fi
     # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1912: checking for $ac_word" >&5
+echo "configure:1936: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1940,7 +1964,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1944: checking for $ac_word" >&5
+echo "configure:1968: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1981,7 +2005,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1985: checking for $ac_word" >&5
+echo "configure:2009: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2022,7 +2046,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2026: checking for $ac_word" >&5
+echo "configure:2050: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2063,7 +2087,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2067: checking for $ac_word" >&5
+echo "configure:2091: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2100,10 +2124,10 @@ done
 test -n "$WINDRES" || WINDRES=":"
 
     if test -z "$HOST_CC"; then
-	HOST_CC="$CC"
+	    HOST_CC="$CC"
     fi
     if test -z "$HOST_CFLAGS"; then
-	HOST_CFLAGS="$CFLAGS"
+	    HOST_CFLAGS="$CFLAGS"
     fi
 fi
 
@@ -2123,7 +2147,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2127: checking for a BSD compatible install" >&5
+echo "configure:2151: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2176,7 +2200,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2180: checking whether ln -s works" >&5
+echo "configure:2204: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2201,7 +2225,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2205: checking for $ac_word" >&5
+echo "configure:2229: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2244,6 +2268,7 @@ DLL_SUFFIX=so
 MKSHLIB='$(CCC) -shared -o $@'
 PR_MD_ASFILES=
 PR_MD_CSRCS=
+PR_MD_ARCH_DIR=unix
 AR_FLAGS='cr $@'
 
 case "$host" in
@@ -2256,28 +2281,111 @@ esac
 
 case "$target" in
 
-*-nto*)
+*-aix*)
     cat >> confdefs.h <<\EOF
 #define XP_UNIX 1
 EOF
 
-    MDCPUCFG_H=_nto.cfg
-    PR_MD_CSRCS=nto.c
-    PR_MD_ARCH_DIR=unix
-    MKSHLIB='qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -o $(@:$(OBJDIR)/%.so=%.so)'
-    CFLAGS="$CFLAGS -Wc,-Wall -Wc,-Wno-parentheses -DNTO -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared"
-    OS_LIBS="-lsocket"
-    _OPTIMIZE_FLAGS="-O2"
-    _DEBUG_FLAGS="-O2 -gdwarf-2"
-    COMPILER_TAG="_qcc"
-    CC="qcc -Vgcc_ntox86 -w"
-    CXX="QCC -Vgcc_ntox86 -w"
-    CPP="qcc -Vgcc_ntox86 -w"
-    LD="qcc -Vgcc_ntox86 -nostdlib"
-    AR="qcc -Vgcc_ntox86 -M -a "
-    AR_FLAGS="$@"
-	;;
+    cat >> confdefs.h <<\EOF
+#define AIX 1
+EOF
 
+    cat >> confdefs.h <<\EOF
+#define SYSV 1
+EOF
+
+    DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall'
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    case "${target_os}" in
+    aix3.2*)
+        USE_NSPR_THREADS=1
+        cat >> confdefs.h <<\EOF
+#define _PR_LOCAL_THREADS_ONLY 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX_RENAME_SELECT 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_NO_LARGE_FILES 1
+EOF
+
+        AIX_LINK_OPTS='-bnso -berok'
+        ;;
+    aix4.1*)
+        cat >> confdefs.h <<\EOF
+#define AIX_RENAME_SELECT 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX_HAVE_ATOMIC_OP_H 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX_TIMERS 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_NO_LARGE_FILES 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX4_1 1
+EOF
+
+        MKSHLIB=
+        DSO_LDOPTS=
+        AIX_LINK_OPTS='-bnso -berok'
+        ;;
+    aix4.3*)
+        cat >> confdefs.h <<\EOF
+#define AIX_HAVE_ATOMIC_OP_H 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX_TIMERS 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_HAVE_OFF64_T 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX4_3 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HAVE_SOCKLEN_T 1
+EOF
+
+        USE_IPV6=1
+        AIX_LINK_OPTS='-brtl -bnso -berok'
+        ;;
+    *)
+        cat >> confdefs.h <<\EOF
+#define AIX_HAVE_ATOMIC_OP_H 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define AIX_TIMERS 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_HAVE_OFF64_T 1
+EOF
+
+        AIX_LINK_OPTS='-brtl -bnso -berok'
+        ;;
+    esac
+    CFLAGS="$CFLAGS -qro -qroconst"
+    if test `grep -c xlC_r $CC`; then
+        CFLAGS="$CFLAGS -qarch=com"
+    fi
+    AIX_WRAP='$(DIST)/lib/aixwrap.o'
+    AIX_TMP='./_aix_tmp.o'
+    ;;
+        
 *-beos*)
     cat >> confdefs.h <<\EOF
 #define XP_BEOS 1
@@ -2293,14 +2401,213 @@ EOF
 
     ;;
 
-*-linux*)
+*-dgux*)
     cat >> confdefs.h <<\EOF
 #define XP_UNIX 1
 EOF
 
-    MDCPUCFG_H=_linux.cfg
-    PR_MD_CSRCS=linux.c
-    PR_MD_ARCH_DIR=unix
+    cat >> confdefs.h <<\EOF
+#define _PR_LOCAL_THREADS_ONLY 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define SVR4 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define SYSV 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define DGUX 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define _DGUX_SOURCE 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define _POSIX4A_DRAFT6_SOURCE 1
+EOF
+
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    DSO_LDOPTS=-G
+    NOSUCHFILE=/no-such-file
+    _OPTIMIZE_FLAGS=-O2
+    _DEBUG_FLAGS=
+    ;;
+
+*-freebsd*)
+    if test "${target_cpu}" != "alpha"; then
+        cat >> confdefs.h <<\EOF
+#define i386 1
+EOF
+
+    fi
+    cat >> confdefs.h <<\EOF
+#define FREEBSD 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define HAVE_BSD_FLOCK 1
+EOF
+
+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall -pipe"
+    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+    if test "$MOZ_OBJFORMAT" = "elf"; then
+        DLL_SUFFIX=so
+    else
+        DLL_SUFFIX=so.1.0
+    fi
+    DSO_CFLAGS=-fPIC
+    DSO_LDOPTS=-Bshareable
+    DSO_LDFLAGS=
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    ;;
+
+*-hpux*)
+    cat >> confdefs.h <<\EOF
+#define HPUX 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define _HPUX_SOURCE 1
+EOF
+
+    DEFINES="$DEFINES -D${target_cpu}"
+    DLL_SUFFIX=sl
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    DSO_LDOPTS='-b +h $(notdir $@)'
+    DSO_LDFLAGS=
+    if test -z "$GNU_CC"; then
+        CC="$CC -Ae"
+        CXX="$CXX -ext"
+        CFLAGS="$CFLAGS +ESlit"
+        CXXFLAGS="$CXXFLAGS +ESlit"
+        DSO_CFLAGS=+Z
+    else
+        DSO_CFLAGS=-fPIC
+    fi
+    if test -n "$MOZILLA_CLIENT"; then
+        USE_NSPR_THREADS=1
+    fi
+    case "${target_os}" in
+    hpuxA.09*)
+        cat >> confdefs.h <<\EOF
+#define HPUX9 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_NEED_H_ERRNO 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_NO_LARGE_FILES 1
+EOF
+
+        ;;
+    hpuxB.10.01*)
+        cat >> confdefs.h <<\EOF
+#define HPUX10 1
+EOF
+
+        ;;
+    hpuxB.10.10*)
+        cat >> confdefs.h <<\EOF
+#define HPUX10 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HPUX10_10 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HAVE_INT_LOCALTIME_R 1
+EOF
+
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    hpuxB.10.20*)
+        cat >> confdefs.h <<\EOF
+#define HPUX10 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HPUX10_20 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HAVE_INT_LOCALTIME_R 1
+EOF
+
+        if test -z "$GNU_CC"; then
+            CFLAGS="$CFLAGS +DAportable +DS1.1"
+            CXXFLAGS="$CXXFLAGS +DAportable +DS1.1"
+        fi
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    hpuxB.10.30*)
+        cat >> confdefs.h <<\EOF
+#define HAVE_POINTER_LOCALTIME_R 1
+EOF
+
+        if test -z "$GNU_CC"; then
+            CFLAGS="$CFLAGS +DAportable +DS1.1"
+            CXXFLAGS="$CXXFLAGS +DAportable +DS1.1"
+        fi
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    hpuxB.11.00*)
+        cat >> confdefs.h <<\EOF
+#define HPUX10 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HPUX11 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _LARGEFILE64_SOURCE 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_HAVE_OFF64_T 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define HAVE_POINTER_LOCALTIME_R 1
+EOF
+
+        if test -z "$GNU_CC"; then
+            if test -z "$USE_64"; then
+                CFLAGS="$CFLAGS +DAportable +DS2.0"
+                CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
+            else
+                CFLAGS="$CFLAGS +DA2.0W +DS2.0"
+                CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
+            fi
+        fi
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    esac
+    case "${target_os}" in
+    hpuxB.10*)
+        cat >> confdefs.h <<\EOF
+#define _PR_NO_LARGE_FILES 1
+EOF
+
+        ;;
+    esac
+    if test -n "$USE_NSPR_THREADS"; then
+        cat >> confdefs.h <<\EOF
+#define _PR_LOCAL_THREADS_ONLY 1
+EOF
+
+    fi
     ;;
 
 *-irix*)
@@ -2327,56 +2634,56 @@ EOF
     MKSHLIB='$(LD) $(SHLIB_LD_OPTS) -rdata_shared -shared -soname $(notdir $@)'
     DSO_LDOPTS='-elf -shared -all'
     case "${target_os}" in
-	irix5*)
+    irix5*)
 	   USE_NSPR_THREADS=1
 	   ;;
-	*)
+    *)
 	   USE_N32=1
 	   USE_PTHREADS=1
 	   ;;
  	esac
     if test "$GNU_CC"; then
-	AS='$(CC) -x assembler-with-cpp -D_ASM -mips2'
-	CFLAGS="$CFLAGS -Wall -Wno-format"
-	_OPTIMIZE_FLAGS="-O6"
+	    AS='$(CC) -x assembler-with-cpp -D_ASM -mips2'
+	    CFLAGS="$CFLAGS -Wall -Wno-format"
+	    _OPTIMIZE_FLAGS="-O6"
     else
-	AS="as -D_ASM $(INCLUDES) -n32"
-	CFLAGS="$CFLAGS -fullwarn -xansi"
-	if test "$USE_N32"; then
-	    _OPTIMIZE_FLAGS="-O -OPT:Olimit=4000"
-	else
-	    _OPTIMIZE_FLAGS="-O -Olimit 4000"
-	fi
-	if test "$USE_MDUPDATE"; then
-	    $CFLAGS="$CFLAGS -MDupdate"
-	fi
-	case "$target}" in
-	*-irix6.*)
-	    CFLAGS="$CFLAGS -multigot"
-	    SHLIB_LD_OPTS="-no_unresolved"
-	    if test "USE_N32"; then
-		CFLAGS="$CFLAGS -n32 -woff 1209"
-		LDFLAGS="$LDFLAGS -n32"
-		SHLIB_LD_OPTS="$SHLIB_LD_OPTS -n32"
-		if test "${target_os}" = "irix6.2"; then
-		    LDFLAGS="$LDFLAGS -Wl,-woff,85"
-		    SHLIB_LD_OPTS="$SHLIB_LD_OPTS -woff 85"
-		fi
+	    AS="as -D_ASM $(INCLUDES) -n32"
+	    CFLAGS="$CFLAGS -fullwarn -xansi"
+	    if test "$USE_N32"; then
+	        _OPTIMIZE_FLAGS="-O -OPT:Olimit=4000"
 	    else
-		if test "$USE_64"; then
-		    CFLAGS="$CFLAGS -64"
-		else
-		    CFLAGS="$CFLAGS -32"
-		fi
+	        _OPTIMIZE_FLAGS="-O -Olimit 4000"
 	    fi
-	    ;;
-	*)
-	    CFLAGS="$CFLAGS -xgot"
-	    ;;
-	esac
+	    if test "$USE_MDUPDATE"; then
+	        $CFLAGS="$CFLAGS -MDupdate"
+	    fi
+	    case "$target}" in
+	    *-irix6.*)
+	        CFLAGS="$CFLAGS -multigot"
+	        SHLIB_LD_OPTS="-no_unresolved"
+	        if test "USE_N32"; then
+		        CFLAGS="$CFLAGS -n32 -woff 1209"
+		        LDFLAGS="$LDFLAGS -n32"
+		        SHLIB_LD_OPTS="$SHLIB_LD_OPTS -n32"
+		        if test "${target_os}" = "irix6.2"; then
+		            LDFLAGS="$LDFLAGS -Wl,-woff,85"
+		            SHLIB_LD_OPTS="$SHLIB_LD_OPTS -woff 85"
+		        fi
+	        else
+		        if test "$USE_64"; then
+		            CFLAGS="$CFLAGS -64"
+		        else
+		            CFLAGS="$CFLAGS -32"
+		        fi
+	        fi
+	        ;;
+	    *)
+	        CFLAGS="$CFLAGS -xgot"
+	        ;;
+	    esac
     fi
     if test "${target_os}" = "irix5.3"; then
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define IRIX5_3 1
 EOF
 
@@ -2396,7 +2703,7 @@ EOF
 	    ;;
 	*)
 	    if test -z "$GNU_CC"; then
-		CFLAGS="$CFLAGS -mips3"
+		    CFLAGS="$CFLAGS -mips3"
 	    fi
 	    cat >> confdefs.h <<\EOF
 #define _PR_HAVE_GETPROTO_R 1
@@ -2410,18 +2717,30 @@ EOF
 	esac
     case "${target_cpu}" in
     alpha*)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
 
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _BSD_SOURCE 1
 EOF
 
-	;;
+	    ;;
     esac
     ;;
 
+*-linux*)
+    cat >> confdefs.h <<\EOF
+#define XP_UNIX 1
+EOF
+
+    CFLAGS="$CFLAGS -pipe"
+    CXXFLAGS="$CXXFLAGS -pipe"
+    MDCPUCFG_H=_linux.cfg
+    PR_MD_CSRCS=linux.c
+    PR_MD_ARCH_DIR=unix
+    ;;
+
 *-mingw*)
     cat >> confdefs.h <<\EOF
 #define XP_PC 1
@@ -2429,58 +2748,86 @@ EOF
 
     PR_MD_ARCH_DIR=windows
     if test -z "$GNU_CC"; then
-	OBJ_SUFFIX=obj
-	LIB_SUFFIX=lib
-	DLL_SUFFIX=dll
+	    OBJ_SUFFIX=obj
+	    LIB_SUFFIX=lib
+	    DLL_SUFFIX=dll
     fi
     MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@'
 
     case "$MOZ_TARGET" in
     WINNT)
-	DEFINES="$DEFINES -DWIN32 -DWINNT -DWin32_Winsock"
-	MDCPUCFG_H=_winnt.cfg
-	;;
+	    DEFINES="$DEFINES -DWIN32 -DWINNT -DWin32_Winsock"
+	    MDCPUCFG_H=_winnt.cfg
+	    ;;
     WIN95)
-	DEFINES="$DEFINES -UWINNT -DWIN32 -DWIN95 -DWin32_Winsock -D_PR_GLOBAL_THREADS_ONLY"
-	MDCPUCFG_H=_win95.cfg
-	;;
+	    DEFINES="$DEFINES -UWINNT -DWIN32 -DWIN95 -DWin32_Winsock -D_PR_GLOBAL_THREADS_ONLY"
+	    MDCPUCFG_H=_win95.cfg
+	    ;;
     WIN16)
-	DEFINES="$DEFINES -UWINNT"
-	MDCPUCFG_H=_win16.cfg
-	;;
+	    DEFINES="$DEFINES -UWINNT"
+	    MDCPUCFG_H=_win16.cfg
+	    ;;
     *)
-	{ echo "configure: error: Missing MOZ_TARGET for ${target}.  Use --enable-target to set." 1>&2; exit 1; }
+	    { echo "configure: error: Missing MOZ_TARGET for ${target}.  Use --enable-target to set." 1>&2; exit 1; }
    	;;
     esac
 
     case "$target" in
     i?86-*)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _X86_ 1
 EOF
 
         ;;
     alpha-*)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _ALPHA_ 1
 EOF
 
-   	;;
+   	    ;;
     mips-*)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _MIPS_ 1
 EOF
 
-	;;
+	    ;;
     *)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _CPU_ARCH_NOT_DEFINED 1
 EOF
 
-	;;
+	    ;;
     esac
     ;;
 
+*-nto*)
+    cat >> confdefs.h <<\EOF
+#define XP_UNIX 1
+EOF
+
+    MDCPUCFG_H=_nto.cfg
+    PR_MD_CSRCS=nto.c
+    MKSHLIB='qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -o $(@:$(OBJDIR)/%.so=%.so)'
+    CFLAGS="$CFLAGS -Wc,-Wall -Wc,-Wno-parentheses -DNTO -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared"
+    OS_LIBS="-lsocket"
+    _OPTIMIZE_FLAGS="-O2"
+    _DEBUG_FLAGS="-O2 -gdwarf-2"
+    COMPILER_TAG="_qcc"
+    CC="qcc -Vgcc_ntox86 -w"
+    CXX="QCC -Vgcc_ntox86 -w"
+    CPP="qcc -Vgcc_ntox86 -w"
+    LD="qcc -Vgcc_ntox86 -nostdlib"
+    AR="qcc -Vgcc_ntox86 -M -a "
+    AR_FLAGS="$@"
+	;;
+
+*)
+    cat >> confdefs.h <<\EOF
+#define XP_UNIX 1
+EOF
+
+    ;;
+   
 esac
 
 if test "$enable_shared" = no; then
@@ -2491,7 +2838,7 @@ fi
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2495: checking how to run the C preprocessor" >&5
+echo "configure:2842: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2506,13 +2853,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2510 "configure"
+#line 2857 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2523,13 +2870,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2527 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2540,13 +2887,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2544 "configure"
+#line 2891 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2572,13 +2919,13 @@ echo "$ac_t""$CPP" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2576: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2923: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2582 "configure"
+#line 2929 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -2596,7 +2943,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2600 "configure"
+#line 2947 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -2620,12 +2967,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2624: checking for $ac_func" >&5
+echo "configure:2971: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2629 "configure"
+#line 2976 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2648,7 +2995,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2677,29 +3024,8 @@ done
 
 OS_LIBS=
 
-# Check whether --with-mozilla or --without-mozilla was given.
-if test "${with_mozilla+set}" = set; then
-  withval="$with_mozilla"
-  	if test "$withval" = "yes"; then
-	    cat >> confdefs.h <<\EOF
-#define MOZILLA_CLIENT 1
-EOF
-
-	else
-	    MOZILLA_CLIENT=
-	fi
-else
-  	if test -n "$MOZILLA_CLIENT"; then
-	    cat >> confdefs.h <<\EOF
-#define MOZILLA_CLIENT 1
-EOF
-
-	fi
-fi
-
-
 echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-echo "configure:2703: checking for pthread_attr_init in -lpthread" >&5
+echo "configure:3029: checking for pthread_attr_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2707,7 +3033,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2711 "configure"
+#line 3037 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2718,7 +3044,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2737,7 +3063,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-echo "configure:2741: checking for pthread_attr_init in -lc_r" >&5
+echo "configure:3067: checking for pthread_attr_init in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2745,7 +3071,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2749 "configure"
+#line 3075 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2756,7 +3082,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2775,7 +3101,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_attr_init in -lc""... $ac_c" 1>&6
-echo "configure:2779: checking for pthread_attr_init in -lc" >&5
+echo "configure:3105: checking for pthread_attr_init in -lc" >&5
 ac_lib_var=`echo c'_'pthread_attr_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2783,7 +3109,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2787 "configure"
+#line 3113 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2794,7 +3120,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2824,20 +3150,20 @@ fi
 # Check whether --with-pthreads or --without-pthreads was given.
 if test "${with_pthreads+set}" = set; then
   withval="$with_pthreads"
-  	if test "$withval" = "yes"; then
+   if test "$withval" = "yes"; then
 	    if test -n "$_HAVE_PTHREADS"; then
-		USE_PTHREADS=1 
-		USE_USER_PTHREADS=
-		USE_NSPR_THREADS=
+		    USE_PTHREADS=1 
+		    USE_USER_PTHREADS=
+		    USE_NSPR_THREADS=
 	    else
-		{ echo "configure: error:  --with-pthreads specified for a system without pthread support " 1>&2; exit 1; };
+		    { echo "configure: error:  --with-pthreads specified for a system without pthread support " 1>&2; exit 1; };
 	    fi
-	else
+	  else
 	    USE_PTHREADS=
 	    _PTHREAD_LDFLAGS=
-	fi
+	  fi
 else
-   if test -n "$_HAVE_PTHREADS"; then
+   if test -n "$_HAVE_PTHREADS" && test -z "$USE_USER_PTHREADS" && test -z "$USER_NSPR_THREADS"; then
 	    USE_PTHREADS=1
 	    USE_USER_PTHREADS=
 	    USE_NSPR_THREADS=
@@ -2848,26 +3174,26 @@ fi
 # Check whether --enable-user-pthreads or --disable-user-pthreads was given.
 if test "${enable_user_pthreads+set}" = set; then
   enableval="$enable_user_pthreads"
-  	if test "$enableval" = "yes"; then
-	    if test -n "$_HAVE_PTHREADS"; then
-		USE_PTHREADS=
-		USE_USER_PTHREADS=1
-		USE_NSPR_THREADS=
+   if test "$enableval" = "yes"; then
+        if test -n "$_HAVE_PTHREADS"; then
+		    USE_PTHREADS=
+		    USE_USER_PTHREADS=1
+		    USE_NSPR_THREADS=
 	    else
-		{ echo "configure: error:  --enable-user-pthreads specified for a system without pthread support " 1>&2; exit 1; };
+		    { echo "configure: error:  --enable-user-pthreads specified for a system without pthread support " 1>&2; exit 1; };
 	    fi
-	fi
+	  fi
 fi
 
 
 # Check whether --enable-nspr-threads or --disable-nspr-threads was given.
 if test "${enable_nspr_threads+set}" = set; then
   enableval="$enable_nspr_threads"
-  	if test "$enableval" = "yes"; then
+   if test "$enableval" = "yes"; then
 	    USE_PTHREADS=
 	    USE_USER_PTHREADS=
 	    USE_NSPR_THREADS=1
-	fi
+	  fi
 fi
 
 
@@ -2878,9 +3204,9 @@ if test "${with_bthreads+set}" = set; then
   withval="$with_bthreads"
   	if test "$withval" = "yes"; then
     	    USE_BTHREADS=1
-	    USE_USER_PTHREADS=
-	    USE_PTHREADS=
-	fi
+	        USE_USER_PTHREADS=
+	        USE_PTHREADS=
+	    fi
 fi
 
     ;;
@@ -2889,32 +3215,30 @@ fi
     # Check whether --with-native-threads or --without-native-threads was given.
 if test "${with_native_threads+set}" = set; then
   withval="$with_native_threads"
-  	if test "$withval" = "yes"; then
+   if test "$withval" = "yes"; then
 	    USE_NATIVE_THREADS=1
 	    USE_USER_PTHREADS=
 	    USE_PTHREADS=
-	fi
+	  fi
 fi
 
     ;;
 esac
 
-USE_CPLUS=
 # Check whether --enable-cplus or --disable-cplus was given.
 if test "${enable_cplus+set}" = set; then
   enableval="$enable_cplus"
    if test "$enableval" = "yes"; then
-	USE_CPLUS=1
+	    USE_CPLUS=1
       fi
 fi
  
 
-USE_IPV6=
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
    if test "$enableval" = "yes"; then
-	USE_IPV6=1
+	    USE_IPV6=1
       fi
 fi
 
@@ -2923,7 +3247,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:2927: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:3251: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -2938,45 +3262,71 @@ echo "configure:2927: checking whether ${CC-cc} accepts -pthread" >&5
 
     case "$target" in
     *-mingw*|*-cygwin*|*-uwin*)
-	;;
+	    ;;
     *-solaris*)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _REENTRANT 1
 EOF
 
-	if test -n "$GNU_CC"; then
-	    CFLAGS="$CFLAGS -mt"
-	    CXXFLAGS="$CXXFLAGS -mt"
-	fi
-	;;
+	    if test -n "$GNU_CC"; then
+	        CFLAGS="$CFLAGS -mt"
+	        CXXFLAGS="$CXXFLAGS -mt"
+	    fi
+	    ;;
     *-freebsd*)
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _REENTRANT 1
 EOF
 
-	cat >> confdefs.h <<\EOF
+	    cat >> confdefs.h <<\EOF
 #define _THREAD_SAFE 1
 EOF
 
-	 	if test "$ac_cv_have_dash_pthread" = "yes"; then
-	    PTHREAD_LDFLAGS=
-	fi
-	;;
-    *)
-	cat >> confdefs.h <<\EOF
+	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
+	        PTHREAD_LDFLAGS=
+	    fi
+	    ;;
+    *-hpuxB.10.10*)
+        cat >> confdefs.h <<\EOF
 #define _REENTRANT 1
 EOF
 
-	;;
+        cat >> confdefs.h <<\EOF
+#define _PR_DCETHREADS 1
+EOF
+
+        ;;
+    *-hpuxB.10.20*)
+        cat >> confdefs.h <<\EOF
+#define _REENTRANT 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _PR_DCETHREADS 1
+EOF
+
+        ;;
+    *-hpux*)
+        cat >> confdefs.h <<\EOF
+#define _POSIX_C_SOURCE=199506L 1
+EOF
+
+        ;;
+    *)
+	    cat >> confdefs.h <<\EOF
+#define _REENTRANT 1
+EOF
+
+	    ;;
     esac
 
     echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:2975: checking for pthread_create" >&5
+echo "configure:3325: checking for pthread_create" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2980 "configure"
+#line 3330 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_create(); below.  */
@@ -2999,7 +3349,7 @@ pthread_create();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_create=yes"
 else
@@ -3018,7 +3368,7 @@ else
   echo "$ac_t""no" 1>&6
 
        echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:3022: checking for pthread_create in -lpthread" >&5
+echo "configure:3372: checking for pthread_create in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3026,7 +3376,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3030 "configure"
+#line 3380 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3037,7 +3387,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3063,42 +3413,65 @@ fi
 
 else 
     if test -n "$USE_USER_PTHREADS"; then
-	USE_PTHREADS=
-	USE_NSPR_THREADS=
+	    USE_PTHREADS=
+	    USE_NSPR_THREADS=
+        case "${target}" in
+        *-hpux*)
+            cat >> confdefs.h <<\EOF
+#define _POSIX_C_SOURCE=199506L 1
+EOF
+
+            ;;
+        esac
     else
-	USE_NSPR_THREADS=1
-	    fi
+	    USE_NSPR_THREADS=1
+	        fi
 fi
 
 case "$target" in
-    *-mingw*|*-cygwin*|*-uwin*)
-	# win32 does not use pthreads
-	USE_PTHREADS=
-	PTHREAD_LDFLAGS=
-	USE_USER_PTHREADS=
-	;;
-    *-solaris*)
-	if test -n "$USE_NATIVE_THREADS"; then
-	    cat >> confdefs.h <<\EOF
+*-aix4.1*)
+    if test -z "$USE_PTHREADS"; then
+        cat >> confdefs.h <<\EOF
+#define AIX_RENAME_SELECT 1
+EOF
+
+    fi
+    ;;
+*-aix4.23*)
+    if test -z "$USE_NSPR_THREADS"; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_POINTER_LOCALTIME_R 1
+EOF
+
+    fi
+    ;;
+*-mingw*|*-cygwin*|*-uwin*)
+        USE_PTHREADS=
+    PTHREAD_LDFLAGS=
+    USE_USER_PTHREADS=
+    ;;
+*-solaris*)
+    if test -n "$USE_NATIVE_THREADS"; then
+        cat >> confdefs.h <<\EOF
 #define _PR_GLOBAL_THREADS_ONLY 1
 EOF
 
-	else
-	    cat >> confdefs.h <<\EOF
+    else
+        cat >> confdefs.h <<\EOF
 #define _PR_LOCAL_THREADS_ONLY 1
 EOF
 
-	fi
-	;;
+    fi
+    ;;
 esac
 
 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:3097: checking for dlopen" >&5
+echo "configure:3470: checking for dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3102 "configure"
+#line 3475 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -3121,7 +3494,7 @@ dlopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlopen=yes"
 else
@@ -3140,7 +3513,7 @@ else
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:3144: checking for dlopen in -ldl" >&5
+echo "configure:3517: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3148,7 +3521,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3152 "configure"
+#line 3525 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3159,7 +3532,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3236,6 +3609,12 @@ fi
 
 
 
+
+
+
+
+
+
 
 
 
@@ -3484,10 +3863,16 @@ s%@OBJ_SUFFIX@%$OBJ_SUFFIX%g
 s%@LIB_SUFFIX@%$LIB_SUFFIX%g
 s%@DLL_SUFFIX@%$DLL_SUFFIX%g
 s%@MKSHLIB@%$MKSHLIB%g
+s%@DSO_CFLAGS@%$DSO_CFLAGS%g
+s%@DSO_LDOPTS@%$DSO_LDOPTS%g
+s%@DSO_LDFLAGS@%$DSO_LDFLAGS%g
 s%@DEFINES@%$DEFINES%g
 s%@AR_FLAGS@%$AR_FLAGS%g
 s%@OS_LIBS@%$OS_LIBS%g
 s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+s%@AIX_LINK_OPTS@%$AIX_LINK_OPTS%g
+s%@NOSUCHFILE@%$NOSUCHFILE%g
+s%@MOZ_OBJFORMAT@%$MOZ_OBJFORMAT%g
 
 CEOF
 EOF
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 38d05e39c84..7000fdafe12 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -48,6 +48,8 @@ USE_USER_PTHREADS=
 USE_NSPR_THREADS=
 USE_N32=
 USE_64=
+USE_CPLUS=
+USE_IPV6=
 USE_MDUPDATE=
 _OPTIMIZE_FLAGS=-O
 _DEBUG_FLAGS=-g
@@ -72,6 +74,21 @@ dnl =
 dnl = Check options that may affect the compiler
 dnl =
 dnl ========================================================
+dnl Check if NSPR is being compiled for Mozilla
+dnl Let --with-arg override environment setting
+dnl
+AC_ARG_WITH(mozilla,
+    [  --with-mozilla          Compile NSPR with Mozilla support],
+    [   if test "$withval" = "yes"; then
+            AC_DEFINE(MOZILLA_CLIENT)
+            MOZILLA_CLIENT=1
+	    else
+	        MOZILLA_CLIENT=
+	    fi],
+    [	if test -n "$MOZILLA_CLIENT"; then
+	        AC_DEFINE(MOZILLA_CLIENT)
+	    fi])
+
 AC_ARG_ENABLE(optimize,
     [  --enable-optimize       Enable code optimizations],
     MOZ_OPTIMIZE=1)
@@ -80,7 +97,7 @@ AC_ARG_ENABLE(debug,
     [  --disable-debug         Do not compile in debugging symbols],
     [	if test "$enableval" = "no"; then
     	    MOZ_DEBUG=
-	fi])
+	    fi])
 
 AC_ARG_ENABLE(shared,
     [  --disable-shared        Do not compile into shared libraries])
@@ -99,14 +116,14 @@ AC_ARG_ENABLE(n32,
 AC_ARG_ENABLE(64bit,
     [  --enable-64bit          Enable 64-bit support (on certain platforms)],
     [ if test "$enableval" = "yes"; then
-	USE_64=1
-    fi ])
+	    USE_64=1
+      fi ])
 
 AC_ARG_ENABLE(mdupdate,
     [  --enable-mdupdate       Enable use of certain compilers' mdupdate feature],
     [ if test "$enableval" = "yes"; then
-	USE_MDUPDATE=1
-    fi ])
+	    USE_MDUPDATE=1
+      fi ])
 
 AC_PATH_PROG(WHOAMI, whoami, :)
 if test -n "$MOZ_DEBUG"; then
@@ -131,17 +148,17 @@ if test "$target" != "$host"; then
 
     AC_MSG_CHECKING([for $host compiler])
     if test -z "$HOST_CC"; then
-	AC_CHECK_PROGS(HOST_CC, gcc cc /usr/ucb/cc, "")
-	if test -z "$HOST_CC"; then
-	    AC_MSG_ERROR([no acceptable cc found in \$PATH])
-	fi
+	    AC_CHECK_PROGS(HOST_CC, gcc cc /usr/ucb/cc, "")
+	    if test -z "$HOST_CC"; then
+	        AC_MSG_ERROR([no acceptable cc found in \$PATH])
+	    fi
     fi
     AC_MSG_RESULT([$HOST_CC])
     if test -z "$HOST_CFLAGS"; then
-	HOST_CFLAGS="$CFLAGS"
+	    HOST_CFLAGS="$CFLAGS"
     fi
     if test -z "$HOST_LDFLAGS"; then
-	HOST_LDFLAGS="$LDFLAGS"
+	    HOST_LDFLAGS="$LDFLAGS"
     fi
 
     CC="$HOST_CC"
@@ -158,29 +175,29 @@ if test "$target" != "$host"; then
     LDFLAGS=$_SAVE_LDFLAGS
 
     if test -z "$CC"; then
-	AC_CHECK_PROGS(CC, "${target_alias}-gcc" "${target}-gcc", :)
+	    AC_CHECK_PROGS(CC, "${target_alias}-gcc" "${target}-gcc", :)
     fi
     unset ac_cv_prog_CC
     AC_PROG_CC
     if test -z "$CXX"; then
-	AC_CHECK_PROGS(CXX, "${target_alias}-g++" "${target}-g++", :)
+	    AC_CHECK_PROGS(CXX, "${target_alias}-g++" "${target}-g++", :)
     fi
     unset ac_cv_prog_CXX
     AC_PROG_CXX
     if test -z "$RANLIB"; then
-	AC_CHECK_PROGS(RANLIB, "${target_alias}-ranlib" "${target}-ranlib", :)
+	    AC_CHECK_PROGS(RANLIB, "${target_alias}-ranlib" "${target}-ranlib", :)
     fi
     if test -z "$AR"; then
-	AC_CHECK_PROGS(AR, "${target_alias}-ar" "${target}-ar", :)
+	    AC_CHECK_PROGS(AR, "${target_alias}-ar" "${target}-ar", :)
     fi
     if test -z "$AS"; then
-	AC_CHECK_PROGS(AS, "${target_alias}-as" "${target}-as", :)
+	    AC_CHECK_PROGS(AS, "${target_alias}-as" "${target}-as", :)
     fi
     if test -z "$DLLTOOL"; then
-	AC_CHECK_PROGS(DLLTOOL, "${target_alias}-dlltool" "${target}-dlltool", :)
+	    AC_CHECK_PROGS(DLLTOOL, "${target_alias}-dlltool" "${target}-dlltool", :)
     fi
     if test -z "$WINDRES"; then
-	AC_CHECK_PROGS(WINDRES, "${target_alias}-windres" "${target}-windres", :)
+	    AC_CHECK_PROGS(WINDRES, "${target_alias}-windres" "${target}-windres", :)
     fi
 else
     AC_PROG_CC
@@ -191,10 +208,10 @@ else
     AC_PATH_PROGS(DLLTOOL, dlltool, :)
     AC_PATH_PROGS(WINDRES, windres, :)
     if test -z "$HOST_CC"; then
-	HOST_CC="$CC"
+	    HOST_CC="$CC"
     fi
     if test -z "$HOST_CFLAGS"; then
-	HOST_CFLAGS="$CFLAGS"
+	    HOST_CFLAGS="$CFLAGS"
     fi
 fi
 
@@ -218,6 +235,7 @@ DLL_SUFFIX=so
 MKSHLIB='$(CCC) -shared -o $@'
 PR_MD_ASFILES=
 PR_MD_CSRCS=
+PR_MD_ARCH_DIR=unix
 AR_FLAGS='cr $@'
 
 dnl ========================================================
@@ -236,36 +254,177 @@ dnl Override of system specific target options
 dnl ========================================================
 case "$target" in
 
-*-nto*)
+*-aix*)
     AC_DEFINE(XP_UNIX)
-    MDCPUCFG_H=_nto.cfg
-    PR_MD_CSRCS=nto.c
-    PR_MD_ARCH_DIR=unix
-    MKSHLIB='qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -o $(@:$(OBJDIR)/%.so=%.so)'
-    CFLAGS="$CFLAGS -Wc,-Wall -Wc,-Wno-parentheses -DNTO -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared"
-    OS_LIBS="-lsocket"
-    _OPTIMIZE_FLAGS="-O2"
-    _DEBUG_FLAGS="-O2 -gdwarf-2"
-    COMPILER_TAG="_qcc"
-    CC="qcc -Vgcc_ntox86 -w"
-    CXX="QCC -Vgcc_ntox86 -w"
-    CPP="qcc -Vgcc_ntox86 -w"
-    LD="qcc -Vgcc_ntox86 -nostdlib"
-    AR="qcc -Vgcc_ntox86 -M -a "
-    AR_FLAGS="$@"
-	;;
-
+    AC_DEFINE(AIX)
+    AC_DEFINE(SYSV)
+    DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall'
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    case "${target_os}" in
+    aix3.2*)
+        USE_NSPR_THREADS=1
+        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+        AC_DEFINE(AIX_RENAME_SELECT)
+        AC_DEFINE(_PR_NO_LARGE_FILES)
+        AIX_LINK_OPTS='-bnso -berok'
+        ;;
+    aix4.1*)
+        AC_DEFINE(AIX_RENAME_SELECT)
+        AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)
+        AC_DEFINE(AIX_TIMERS)
+        AC_DEFINE(_PR_NO_LARGE_FILES)
+        AC_DEFINE(AIX4_1)
+        MKSHLIB=
+        DSO_LDOPTS=
+        AIX_LINK_OPTS='-bnso -berok'
+        ;;
+    aix4.3*)
+        AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)
+        AC_DEFINE(AIX_TIMERS)
+        AC_DEFINE(_PR_HAVE_OFF64_T)
+        AC_DEFINE(AIX4_3)
+        AC_DEFINE(HAVE_SOCKLEN_T)
+        USE_IPV6=1
+        AIX_LINK_OPTS='-brtl -bnso -berok'
+        ;;
+    *)
+        AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)
+        AC_DEFINE(AIX_TIMERS)
+        AC_DEFINE(_PR_HAVE_OFF64_T)
+        AIX_LINK_OPTS='-brtl -bnso -berok'
+        ;;
+    esac
+    CFLAGS="$CFLAGS -qro -qroconst"
+    if test `grep -c xlC_r $CC`; then
+        CFLAGS="$CFLAGS -qarch=com"
+    fi
+    AIX_WRAP='$(DIST)/lib/aixwrap.o'
+    AIX_TMP='./_aix_tmp.o'
+    ;;
+        
 *-beos*)
     AC_DEFINE(XP_BEOS)
     AC_DEFINE(BeOS)
     AC_DEFINE(BEOS)
     ;;
 
-*-linux*)
+*-dgux*)
     AC_DEFINE(XP_UNIX)
-    MDCPUCFG_H=_linux.cfg
-    PR_MD_CSRCS=linux.c
-    PR_MD_ARCH_DIR=unix
+    AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+    AC_DEFINE(SVR4)
+    AC_DEFINE(SYSV)
+    AC_DEFINE(DGUX)
+    AC_DEFINE(_DGUX_SOURCE)
+    AC_DEFINE(_POSIX4A_DRAFT6_SOURCE)
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    DSO_LDOPTS=-G
+    NOSUCHFILE=/no-such-file
+    _OPTIMIZE_FLAGS=-O2
+    _DEBUG_FLAGS=
+    ;;
+
+*-freebsd*)
+    if test "${target_cpu}" != "alpha"; then
+        AC_DEFINE(i386)
+    fi
+    AC_DEFINE(FREEBSD)
+    AC_DEFINE(HAVE_BSD_FLOCK)
+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall -pipe"
+    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+    if test "$MOZ_OBJFORMAT" = "elf"; then
+        DLL_SUFFIX=so
+    else
+        DLL_SUFFIX=so.1.0
+    fi
+    DSO_CFLAGS=-fPIC
+    DSO_LDOPTS=-Bshareable
+    DSO_LDFLAGS=
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    ;;
+
+*-hpux*)
+    AC_DEFINE(HPUX)
+    AC_DEFINE(_HPUX_SOURCE)
+    DEFINES="$DEFINES -D${target_cpu}"
+    DLL_SUFFIX=sl
+    MKSHLIB='$(LD) $(DSO_LDOPTS)'
+    DSO_LDOPTS='-b +h $(notdir $@)'
+    DSO_LDFLAGS=
+    if test -z "$GNU_CC"; then
+        CC="$CC -Ae"
+        CXX="$CXX -ext"
+        CFLAGS="$CFLAGS +ESlit"
+        CXXFLAGS="$CXXFLAGS +ESlit"
+        DSO_CFLAGS=+Z
+    else
+        DSO_CFLAGS=-fPIC
+    fi
+    if test -n "$MOZILLA_CLIENT"; then
+        USE_NSPR_THREADS=1
+    fi
+    case "${target_os}" in
+    hpuxA.09*)
+        AC_DEFINE(HPUX9)
+        AC_DEFINE(_PR_NEED_H_ERRNO)
+        AC_DEFINE(_PR_NO_LARGE_FILES)
+        ;;
+    hpuxB.10.01*)
+        AC_DEFINE(HPUX10)
+        ;;
+    hpuxB.10.10*)
+        AC_DEFINE(HPUX10)
+        AC_DEFINE(HPUX10_10)
+        AC_DEFINE(HAVE_INT_LOCALTIME_R)
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    hpuxB.10.20*)
+        AC_DEFINE(HPUX10)
+        AC_DEFINE(HPUX10_20)
+        AC_DEFINE(HAVE_INT_LOCALTIME_R)
+        if test -z "$GNU_CC"; then
+            CFLAGS="$CFLAGS +DAportable +DS1.1"
+            CXXFLAGS="$CXXFLAGS +DAportable +DS1.1"
+        fi
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    hpuxB.10.30*)
+        AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
+        if test -z "$GNU_CC"; then
+            CFLAGS="$CFLAGS +DAportable +DS1.1"
+            CXXFLAGS="$CXXFLAGS +DAportable +DS1.1"
+        fi
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    hpuxB.11.00*)
+        AC_DEFINE(HPUX10)
+        AC_DEFINE(HPUX11)
+        AC_DEFINE(_LARGEFILE64_SOURCE)
+        AC_DEFINE(_PR_HAVE_OFF64_T)
+        AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
+        if test -z "$GNU_CC"; then
+            if test -z "$USE_64"; then
+                CFLAGS="$CFLAGS +DAportable +DS2.0"
+                CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
+            else
+                CFLAGS="$CFLAGS +DA2.0W +DS2.0"
+                CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
+            fi
+        fi
+        USE_PTHREADS=1
+        USE_NSPR_THREADS=
+        ;;
+    esac
+    case "${target_os}" in
+    hpuxB.10*)
+        AC_DEFINE(_PR_NO_LARGE_FILES)
+        ;;
+    esac
+    if test -n "$USE_NSPR_THREADS"; then
+        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+    fi
     ;;
 
 *-irix*)
@@ -280,56 +439,56 @@ case "$target" in
     MKSHLIB='$(LD) $(SHLIB_LD_OPTS) -rdata_shared -shared -soname $(notdir $@)'
     DSO_LDOPTS='-elf -shared -all'
     case "${target_os}" in
-	irix5*)
+    irix5*)
 	   USE_NSPR_THREADS=1
 	   ;;
-	*)
+    *)
 	   USE_N32=1
 	   USE_PTHREADS=1
 	   ;;
  	esac
     if test "$GNU_CC"; then
-	AS='$(CC) -x assembler-with-cpp -D_ASM -mips2'
-	CFLAGS="$CFLAGS -Wall -Wno-format"
-	_OPTIMIZE_FLAGS="-O6"
+	    AS='$(CC) -x assembler-with-cpp -D_ASM -mips2'
+	    CFLAGS="$CFLAGS -Wall -Wno-format"
+	    _OPTIMIZE_FLAGS="-O6"
     else
-	AS="as -D_ASM $(INCLUDES) -n32"
-	CFLAGS="$CFLAGS -fullwarn -xansi"
-	if test "$USE_N32"; then
-	    _OPTIMIZE_FLAGS="-O -OPT:Olimit=4000"
-	else
-	    _OPTIMIZE_FLAGS="-O -Olimit 4000"
-	fi
-	if test "$USE_MDUPDATE"; then
-	    $CFLAGS="$CFLAGS -MDupdate"
-	fi
-	case "$target}" in
-	*-irix6.*)
-	    CFLAGS="$CFLAGS -multigot"
-	    SHLIB_LD_OPTS="-no_unresolved"
-	    if test "USE_N32"; then
-		CFLAGS="$CFLAGS -n32 -woff 1209"
-		LDFLAGS="$LDFLAGS -n32"
-		SHLIB_LD_OPTS="$SHLIB_LD_OPTS -n32"
-		if test "${target_os}" = "irix6.2"; then
-		    LDFLAGS="$LDFLAGS -Wl,-woff,85"
-		    SHLIB_LD_OPTS="$SHLIB_LD_OPTS -woff 85"
-		fi
+	    AS="as -D_ASM $(INCLUDES) -n32"
+	    CFLAGS="$CFLAGS -fullwarn -xansi"
+	    if test "$USE_N32"; then
+	        _OPTIMIZE_FLAGS="-O -OPT:Olimit=4000"
 	    else
-		if test "$USE_64"; then
-		    CFLAGS="$CFLAGS -64"
-		else
-		    CFLAGS="$CFLAGS -32"
-		fi
+	        _OPTIMIZE_FLAGS="-O -Olimit 4000"
 	    fi
-	    ;;
-	*)
-	    CFLAGS="$CFLAGS -xgot"
-	    ;;
-	esac
+	    if test "$USE_MDUPDATE"; then
+	        $CFLAGS="$CFLAGS -MDupdate"
+	    fi
+	    case "$target}" in
+	    *-irix6.*)
+	        CFLAGS="$CFLAGS -multigot"
+	        SHLIB_LD_OPTS="-no_unresolved"
+	        if test "USE_N32"; then
+		        CFLAGS="$CFLAGS -n32 -woff 1209"
+		        LDFLAGS="$LDFLAGS -n32"
+		        SHLIB_LD_OPTS="$SHLIB_LD_OPTS -n32"
+		        if test "${target_os}" = "irix6.2"; then
+		            LDFLAGS="$LDFLAGS -Wl,-woff,85"
+		            SHLIB_LD_OPTS="$SHLIB_LD_OPTS -woff 85"
+		        fi
+	        else
+		        if test "$USE_64"; then
+		            CFLAGS="$CFLAGS -64"
+		        else
+		            CFLAGS="$CFLAGS -32"
+		        fi
+	        fi
+	        ;;
+	    *)
+	        CFLAGS="$CFLAGS -xgot"
+	        ;;
+	    esac
     fi
     if test "${target_os}" = "irix5.3"; then
-	AC_DEFINE(IRIX5_3)
+	    AC_DEFINE(IRIX5_3)
     fi
     case "${target_os}" in
 	irix5*)
@@ -343,7 +502,7 @@ case "$target" in
 	    ;;
 	*)
 	    if test -z "$GNU_CC"; then
-		CFLAGS="$CFLAGS -mips3"
+		    CFLAGS="$CFLAGS -mips3"
 	    fi
 	    AC_DEFINE(_PR_HAVE_GETPROTO_R)
 	    AC_DEFINE(_PR_HAVE_GETPROTO_R_POINTER)
@@ -351,56 +510,87 @@ case "$target" in
 	esac
     case "${target_cpu}" in
     alpha*)
-	AC_DEFINE(_POSIX_SOURCE)
-	AC_DEFINE(_BSD_SOURCE)
-	;;
+	    AC_DEFINE(_POSIX_SOURCE)
+	    AC_DEFINE(_BSD_SOURCE)
+	    ;;
     esac
     ;;
 
+*-linux*)
+    AC_DEFINE(XP_UNIX)
+    CFLAGS="$CFLAGS -pipe"
+    CXXFLAGS="$CXXFLAGS -pipe"
+    MDCPUCFG_H=_linux.cfg
+    PR_MD_CSRCS=linux.c
+    PR_MD_ARCH_DIR=unix
+    ;;
+
 *-mingw*)
     AC_DEFINE(XP_PC)
     PR_MD_ARCH_DIR=windows
     if test -z "$GNU_CC"; then
-	OBJ_SUFFIX=obj
-	LIB_SUFFIX=lib
-	DLL_SUFFIX=dll
+	    OBJ_SUFFIX=obj
+	    LIB_SUFFIX=lib
+	    DLL_SUFFIX=dll
     fi
     MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@'
 
     case "$MOZ_TARGET" in
     WINNT)
-	DEFINES="$DEFINES -DWIN32 -DWINNT -DWin32_Winsock"
-	MDCPUCFG_H=_winnt.cfg
-	;;
+	    DEFINES="$DEFINES -DWIN32 -DWINNT -DWin32_Winsock"
+	    MDCPUCFG_H=_winnt.cfg
+	    ;;
     WIN95)
-	DEFINES="$DEFINES -UWINNT -DWIN32 -DWIN95 -DWin32_Winsock -D_PR_GLOBAL_THREADS_ONLY"
-	MDCPUCFG_H=_win95.cfg
-	;;
+	    DEFINES="$DEFINES -UWINNT -DWIN32 -DWIN95 -DWin32_Winsock -D_PR_GLOBAL_THREADS_ONLY"
+	    MDCPUCFG_H=_win95.cfg
+	    ;;
     WIN16)
-	DEFINES="$DEFINES -UWINNT"
-	MDCPUCFG_H=_win16.cfg
-	;;
+	    DEFINES="$DEFINES -UWINNT"
+	    MDCPUCFG_H=_win16.cfg
+	    ;;
     *)
-	AC_MSG_ERROR([Missing MOZ_TARGET for ${target}.  Use --enable-target to set.])
+	    AC_MSG_ERROR([Missing MOZ_TARGET for ${target}.  Use --enable-target to set.])
    	;;
     esac
 
     case "$target" in
     i?86-*)
-	AC_DEFINE(_X86_)
+	    AC_DEFINE(_X86_)
         ;;
     alpha-*)
-	AC_DEFINE(_ALPHA_)
-   	;;
+	    AC_DEFINE(_ALPHA_)
+   	    ;;
     mips-*)
-	AC_DEFINE(_MIPS_)
-	;;
+	    AC_DEFINE(_MIPS_)
+	    ;;
     *)
-	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
-	;;
+	    AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+	    ;;
     esac
     ;;
 
+*-nto*)
+    AC_DEFINE(XP_UNIX)
+    MDCPUCFG_H=_nto.cfg
+    PR_MD_CSRCS=nto.c
+    MKSHLIB='qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -o $(@:$(OBJDIR)/%.so=%.so)'
+    CFLAGS="$CFLAGS -Wc,-Wall -Wc,-Wno-parentheses -DNTO -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared"
+    OS_LIBS="-lsocket"
+    _OPTIMIZE_FLAGS="-O2"
+    _DEBUG_FLAGS="-O2 -gdwarf-2"
+    COMPILER_TAG="_qcc"
+    CC="qcc -Vgcc_ntox86 -w"
+    CXX="QCC -Vgcc_ntox86 -w"
+    CPP="qcc -Vgcc_ntox86 -w"
+    LD="qcc -Vgcc_ntox86 -nostdlib"
+    AR="qcc -Vgcc_ntox86 -M -a "
+    AR_FLAGS="$@"
+	;;
+
+*)
+    AC_DEFINE(XP_UNIX)
+    ;;
+   
 esac
 
 dnl Turn off shared libraries if asked to do so.
@@ -479,20 +669,6 @@ dnl ========================================================
 
 OS_LIBS=
 
-dnl Check if NSPR is being compiled for Mozilla
-dnl Let --with-arg override environment setting
-dnl
-AC_ARG_WITH(mozilla,
-    [  --with-mozilla          Compile NSPR with Mozilla support],
-    [	if test "$withval" = "yes"; then
-	    AC_DEFINE(MOZILLA_CLIENT)
-	else
-	    MOZILLA_CLIENT=
-	fi],
-    [	if test -n "$MOZILLA_CLIENT"; then
-	    AC_DEFINE(MOZILLA_CLIENT)
-	fi])
-
 AC_CHECK_LIB(pthread, pthread_attr_init, 
              _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
     AC_CHECK_LIB(c_r, pthread_attr_init,
@@ -504,19 +680,19 @@ AC_CHECK_LIB(pthread, pthread_attr_init,
 
 AC_ARG_WITH(pthreads,
     [  --with-pthreads         Use system pthreads library as thread subsystem],
-    [	if test "$withval" = "yes"; then
+    [ if test "$withval" = "yes"; then
 	    if test -n "$_HAVE_PTHREADS"; then
-		USE_PTHREADS=1 
-		USE_USER_PTHREADS=
-		USE_NSPR_THREADS=
+		    USE_PTHREADS=1 
+		    USE_USER_PTHREADS=
+		    USE_NSPR_THREADS=
 	    else
-		AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]);
+		    AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]);
 	    fi
-	else
+	  else
 	    USE_PTHREADS=
 	    _PTHREAD_LDFLAGS=
-	fi],
-	[ if test -n "$_HAVE_PTHREADS"; then
+	  fi],
+	[ if test -n "$_HAVE_PTHREADS" && test -z "$USE_USER_PTHREADS" && test -z "$USER_NSPR_THREADS"; then
 	    USE_PTHREADS=1
 	    USE_USER_PTHREADS=
 	    USE_NSPR_THREADS=
@@ -524,23 +700,23 @@ AC_ARG_WITH(pthreads,
 
 AC_ARG_ENABLE(user-pthreads,
     [  --enable-user-pthreads  Build using userland pthreads],
-    [	if test "$enableval" = "yes"; then
-	    if test -n "$_HAVE_PTHREADS"; then
-		USE_PTHREADS=
-		USE_USER_PTHREADS=1
-		USE_NSPR_THREADS=
+    [ if test "$enableval" = "yes"; then
+        if test -n "$_HAVE_PTHREADS"; then
+		    USE_PTHREADS=
+		    USE_USER_PTHREADS=1
+		    USE_NSPR_THREADS=
 	    else
-		AC_MSG_ERROR([ --enable-user-pthreads specified for a system without pthread support ]);
+		    AC_MSG_ERROR([ --enable-user-pthreads specified for a system without pthread support ]);
 	    fi
-	fi])
+	  fi])
 
 AC_ARG_ENABLE(nspr-threads,
     [  --enable-nspr-threads   Build using classic nspr threads],
-    [	if test "$enableval" = "yes"; then
+    [ if test "$enableval" = "yes"; then
 	    USE_PTHREADS=
 	    USE_USER_PTHREADS=
 	    USE_NSPR_THREADS=1
-	fi])
+	  fi])
 
 case "$target" in
 *-beos*)
@@ -548,34 +724,32 @@ case "$target" in
     [  --with-bthreads         Use system bthreads library as thread subsystem (BeOS only)],
     [	if test "$withval" = "yes"; then
     	    USE_BTHREADS=1
-	    USE_USER_PTHREADS=
-	    USE_PTHREADS=
-	fi])
+	        USE_USER_PTHREADS=
+	        USE_PTHREADS=
+	    fi])
     ;;
 
 *-solaris*)
     AC_ARG_WITH(native-threads,
     [  --with-native-threads   Use native system threads as thread subsystem (Solaris only)],
-    [	if test "$withval" = "yes"; then
+    [ if test "$withval" = "yes"; then
 	    USE_NATIVE_THREADS=1
 	    USE_USER_PTHREADS=
 	    USE_PTHREADS=
-	fi])
+	  fi])
     ;;
 esac
 
-USE_CPLUS=
 AC_ARG_ENABLE(cplus,
     [  --enable-cplus          Use cplus for whatever reason],
     [ if test "$enableval" = "yes"; then
-	USE_CPLUS=1
+	    USE_CPLUS=1
       fi]) 
 
-USE_IPV6=
 AC_ARG_ENABLE(ipv6,
     [  --enable-ipv6           Compile ipv6 support],
     [ if test "$enableval" = "yes"; then
-	USE_IPV6=1
+	    USE_IPV6=1
       fi])
 
 if test -n "$USE_PTHREADS"; then
@@ -597,25 +771,36 @@ if test -n "$USE_PTHREADS"; then
 
     case "$target" in
     *-mingw*|*-cygwin*|*-uwin*)
-	;;
+	    ;;
     *-solaris*)
-	AC_DEFINE(_REENTRANT)
-	if test -n "$GNU_CC"; then
-	    CFLAGS="$CFLAGS -mt"
-	    CXXFLAGS="$CXXFLAGS -mt"
-	fi
-	;;
+	    AC_DEFINE(_REENTRANT)
+	    if test -n "$GNU_CC"; then
+	        CFLAGS="$CFLAGS -mt"
+	        CXXFLAGS="$CXXFLAGS -mt"
+	    fi
+	    ;;
     *-freebsd*)
-	AC_DEFINE(_REENTRANT)
-	AC_DEFINE(_THREAD_SAFE)
-	 dnl -pthread links in -lc_r, so don't specify it explicitly.
-	if test "$ac_cv_have_dash_pthread" = "yes"; then
-	    PTHREAD_LDFLAGS=
-	fi
-	;;
+	    AC_DEFINE(_REENTRANT)
+	    AC_DEFINE(_THREAD_SAFE)
+	    dnl -pthread links in -lc_r, so don't specify it explicitly.
+	    if test "$ac_cv_have_dash_pthread" = "yes"; then
+	        PTHREAD_LDFLAGS=
+	    fi
+	    ;;
+    *-hpuxB.10.10*)
+        AC_DEFINE(_REENTRANT)
+        AC_DEFINE(_PR_DCETHREADS)
+        ;;
+    *-hpuxB.10.20*)
+        AC_DEFINE(_REENTRANT)
+        AC_DEFINE(_PR_DCETHREADS)
+        ;;
+    *-hpux*)
+        AC_DEFINE(_POSIX_C_SOURCE=199506L)
+        ;;
     *)
-	AC_DEFINE(_REENTRANT)
-	;;
+	    AC_DEFINE(_REENTRANT)
+	    ;;
     esac
 
     AC_CHECK_FUNC(pthread_create,,[
@@ -624,29 +809,44 @@ if test -n "$USE_PTHREADS"; then
 
 else 
     if test -n "$USE_USER_PTHREADS"; then
-	USE_PTHREADS=
-	USE_NSPR_THREADS=
+	    USE_PTHREADS=
+	    USE_NSPR_THREADS=
+        case "${target}" in
+        *-hpux*)
+            AC_DEFINE(_POSIX_C_SOURCE=199506L)
+            ;;
+        esac
     else
-	USE_NSPR_THREADS=1
-	dnl AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+	    USE_NSPR_THREADS=1
+	    dnl AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
     fi
 fi
 dnl Special thread exceptions
 
 case "$target" in
-    *-mingw*|*-cygwin*|*-uwin*)
-	# win32 does not use pthreads
-	USE_PTHREADS=
-	PTHREAD_LDFLAGS=
-	USE_USER_PTHREADS=
-	;;
-    *-solaris*)
-	if test -n "$USE_NATIVE_THREADS"; then
-	    AC_DEFINE(_PR_GLOBAL_THREADS_ONLY)
-	else
-	    AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-	fi
-	;;
+*-aix4.1*)
+    if test -z "$USE_PTHREADS"; then
+        AC_DEFINE(AIX_RENAME_SELECT)
+    fi
+    ;;
+*-aix4.[23]*)
+    if test -z "$USE_NSPR_THREADS"; then
+        AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
+    fi
+    ;;
+*-mingw*|*-cygwin*|*-uwin*)
+    dnl win32 does not use pthreads
+    USE_PTHREADS=
+    PTHREAD_LDFLAGS=
+    USE_USER_PTHREADS=
+    ;;
+*-solaris*)
+    if test -n "$USE_NATIVE_THREADS"; then
+        AC_DEFINE(_PR_GLOBAL_THREADS_ONLY)
+    else
+        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+    fi
+    ;;
 esac
 
 AC_CHECK_FUNC(dlopen,,[
@@ -703,6 +903,9 @@ AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(DLL_SUFFIX)
 AC_SUBST(MKSHLIB)
+AC_SUBST(DSO_CFLAGS)
+AC_SUBST(DSO_LDOPTS)
+AC_SUBST(DSO_LDFLAGS)
 
 AC_SUBST(DEFINES)
 AC_SUBST(DEFS)
@@ -715,6 +918,9 @@ AC_SUBST(PERL)
 
 AC_SUBST(OS_LIBS)
 AC_SUBST(EXTRA_LIBS)
+AC_SUBST(AIX_LINK_OPTS)
+AC_SUBST(NOSUCHFILE)
+AC_SUBST(MOZ_OBJFORMAT)
 
 dnl ========================================================
 dnl Generate output files.