From 4304fa2b2b488e43822a4d4f9a2fd163207ac55f Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 7 Apr 2001 22:15:54 +0000
Subject: [PATCH] La la la.  Still redefine NSPR_CFLAGS for OS/2.  nsinstall
 should not be using NSPR_CFLAGS in any case. Hopefully fixing tb bustage

git-svn-id: svn://10.0.0.236/trunk@91665 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/configure    | 10 +++++-----
 mozilla/configure.in | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mozilla/configure b/mozilla/configure
index ba6cc19724d..1a3446e6009 100755
--- a/mozilla/configure
+++ b/mozilla/configure
@@ -13854,19 +13854,19 @@ fi
 fi
 
 if test -z "$MOZ_NATIVE_NSPR"; then
+    # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
+    echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
     case "$target" in
     *-*-os2_vacpp)
         ;;
     *)
-        # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
-        NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --cflags`
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
-        echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
         $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-        $PERL -pi.bak -e "s {^NSPR_CFLAGS\s*=.*} {NSPR_CFLAGS = $NSPR_CFLAGS }" config/autoconf.mk
-        rm -f config/autoconf.mk.bak
         ;;
     esac
+    NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --cflags`
+    $PERL -pi.bak -e "s {^NSPR_CFLAGS\s*=.*} {NSPR_CFLAGS = $NSPR_CFLAGS }" config/autoconf.mk
+    rm -f config/autoconf.mk.bak
 fi
 
 # if we're building the LDAP XPCOM component, we need to build 
diff --git a/mozilla/configure.in b/mozilla/configure.in
index c5b59085448..df8692c1ce4 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -4513,19 +4513,19 @@ if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
 fi
 
 if test -z "$MOZ_NATIVE_NSPR"; then
+    # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
+    AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
     case "$target" in
     *-*-os2_vacpp)
         ;;
     *)
-        # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
-        NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --cflags`
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
-        AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
         $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-        $PERL -pi.bak -e "s {^NSPR_CFLAGS\s*=.*} {NSPR_CFLAGS = $NSPR_CFLAGS }" config/autoconf.mk
-        rm -f config/autoconf.mk.bak
         ;;
     esac
+    NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --cflags`
+    $PERL -pi.bak -e "s {^NSPR_CFLAGS\s*=.*} {NSPR_CFLAGS = $NSPR_CFLAGS }" config/autoconf.mk
+    rm -f config/autoconf.mk.bak
 fi
 
 # if we're building the LDAP XPCOM component, we need to build