A couple of Makefile.ins I missed and fixed the broken check for HOSTCC

1 files changed, 30 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index 8b686f9b..eb64d355 100644
--- a/configure.in
+++ b/configure.in
@@ -31,8 +31,8 @@ HOSTCXXFLAGS="${HOSTCXXFLAGS=}"
 
 AC_ARG_ENABLE(pthreads,
     [  --enable-pthreads           Use system pthreads library as thread subsystem],
-    USE_PTHREADS=1,
-    USE_PTHREADS=)
+    [ USE_PTHREADS=1 CLASSIC_NSPR=],
+    [ USE_PTHREADS= CLASSIC_NSPR=1])
 
 AC_ARG_ENABLE(bthreads,
     [  --enable-bthreads           Use system bthreads library as thread subsystem],
@@ -49,6 +49,13 @@ AC_ARG_ENABLE(ipv6,
     USE_IPV6=1,
     USE_IPV6=)
 
+if test "$CLASSIC_NSPR" = 1 ; then
+AC_ARG_ENABLE(pthreads-user,
+    [  --enable-pthreads-user      Build pthreads-user version],
+    PTHREADS_USER=1,
+    PTHREADS_USER=)
+fi
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
@@ -75,7 +82,14 @@ if test "$cross_compiling" = "no"; then
     fi
 else
 # do some stuff
+    dnl We were given the xcompilers, now we need to find the native
+    dnl compilers if they weren't given
     echo "Cross compiling"
+    if test -z "$HOSTCC" ; then
+	if test -z "$HOSTCFLAGS"; then
+	    HOSTCFLAGS=$CFLAGS
+	fi
+    fi
 fi
 
 echo "Using $host $build $target"
@@ -88,7 +102,19 @@ case "$host" in
 esac
 
 case "$target" in
-*-linux*)
+i?86-*-linux*)
+    MDCPUCFG_H=_linux.cfg
+    PR_MD_CSRCS=linux.c
+    PR_MD_ASFILES=
+    PR_MD_ARCH_DIR=unix
+    if test "$USE_PTHREADS" = 1 ; then
+	CFLAGS="$CFLAGS -D_REENTRANT"
+    else
+	CFLAGS="$CFLAGS -D_PR_LOCAL_THREADS_ONLY"
+    fi
+    ;;
+
+alpha-*-linux*)
     MDCPUCFG_H=_linux.cfg
     PR_MD_CSRCS=linux.c
     PR_MD_ASFILES=
@@ -98,6 +124,7 @@ case "$target" in
     else
 	CFLAGS="$CFLAGS -D_PR_LOCAL_THREADS_ONLY"
     fi
+    CFLAGS="$CFLAGS -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR"
     ;;
 
 *-mingw*)