From 8515120e018ecc95f1a8f741e4927095733daab8 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Mon, 6 Dec 1999 03:28:31 +0000
Subject: [PATCH] Another attempt to fix bug #18966.  Added $(INCLUDES) to AS
 and fixed irix6.5 detection.

---
 nsprpub/configure    | 26 +++++++++++++-------------
 nsprpub/configure.in | 17 +++++++----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/nsprpub/configure b/nsprpub/configure
index 504e09d0eae..61d99fb00bb 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -2668,7 +2668,7 @@ EOF
 	   ;;
  	esac
     if test "$GNU_CC"; then
-	    AS='$(CC) -x assembler-with-cpp -D_ASM -mips2'
+	    AS='$(CC) -x assembler-with-cpp -D_ASM -mips2 $(INCLUDES)'
 	    CFLAGS="$CFLAGS -Wall -Wno-format"
 	    _OPTIMIZE_FLAGS="-O6"
     else
@@ -2713,20 +2713,8 @@ EOF
 EOF
 
     fi
-    case "${target_os}" in
-	irix5*)
-	    ;;
-	*)
-	    cat >> confdefs.h <<\EOF
-#define _PR_HAVE_SGI_PRDA_PROCMASK 1
-EOF
-
-	    ;;
-	esac
     case "${target_os}" in
 	irix6.5*)
-	    ;;
-	*)
 	    if test -z "$GNU_CC"; then
 		    CFLAGS="$CFLAGS -mips3"
 	    fi
@@ -2736,6 +2724,18 @@ EOF
 
 	    cat >> confdefs.h <<\EOF
 #define _PR_HAVE_GETPROTO_R_POINTER 1
+EOF
+
+	    cat >> confdefs.h <<\EOF
+#define _PR_HAVE_SGI_PRDA_PROCMASK 1
+EOF
+
+	    ;;
+	irix5*)
+	    ;;
+	*)
+	    cat >> confdefs.h <<\EOF
+#define _PR_HAVE_SGI_PRDA_PROCMASK 1
 EOF
 
 	    ;;
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 81319570753..f66ca201212 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -473,7 +473,7 @@ case "$target" in
 	   ;;
  	esac
     if test "$GNU_CC"; then
-	    AS='$(CC) -x assembler-with-cpp -D_ASM -mips2'
+	    AS='$(CC) -x assembler-with-cpp -D_ASM -mips2 $(INCLUDES)'
 	    CFLAGS="$CFLAGS -Wall -Wno-format"
 	    _OPTIMIZE_FLAGS="-O6"
     else
@@ -515,22 +515,19 @@ case "$target" in
     if test "${target_os}" = "irix5.3"; then
 	    AC_DEFINE(IRIX5_3)
     fi
-    case "${target_os}" in
-	irix5*)
-	    ;;
-	*)
-	    AC_DEFINE(_PR_HAVE_SGI_PRDA_PROCMASK)
-	    ;;
-	esac
     case "${target_os}" in
 	irix6.5*)
-	    ;;
-	*)
 	    if test -z "$GNU_CC"; then
 		    CFLAGS="$CFLAGS -mips3"
 	    fi
 	    AC_DEFINE(_PR_HAVE_GETPROTO_R)
 	    AC_DEFINE(_PR_HAVE_GETPROTO_R_POINTER)
+	    AC_DEFINE(_PR_HAVE_SGI_PRDA_PROCMASK)
+	    ;;
+	irix5*)
+	    ;;
+	*)
+	    AC_DEFINE(_PR_HAVE_SGI_PRDA_PROCMASK)
 	    ;;
 	esac
     case "${target_cpu}" in