From 7aa63a371193e2bbbfb4994b410089d56e4e3e12 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Wed, 28 Sep 2005 13:51:38 +0000 Subject: [PATCH] #304785 r=chase, a=asa Patch from Peter Weilbacher/Steven Levine Multiple calls to nspr-config causing slowdown on certain machines git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@181131 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/configure.in b/mozilla/configure.in index 308731f0f22..62f227afa67 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -7040,10 +7040,12 @@ 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]) if test ! "$VACPP" && test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then - $PERL -pi.bak -e '$v = q|$\\(DIST\\)|; $v = `./nsprpub/config/nspr-config --prefix=$v --exec-prefix=$v --libdir=$v/lib --libs`; s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $v }' config/autoconf.mk + _libs=`./nsprpub/config/nspr-config --prefix=$\(DIST\) --exec-prefix=$\(DIST\) --libdir=$\(DIST\)/lib --libs` + $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $_libs'" config/autoconf.mk fi if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE" ; then - $PERL -pi.bak -e '$v = q|$\\(DIST\\)|; $v = `./nsprpub/config/nspr-config --prefix=$v --exec-prefix=$v --includedir=$v/include/nspr --cflags`; s {^NSPR_CFLAGS\s*=.*} {NSPR_CFLAGS = $v }' config/autoconf.mk + _cflags=`./nsprpub/config/nspr-config --prefix=$\(DIST\) --exec-prefix=$\(DIST\) --includedir=$\(DIST\)/include/nspr --cflags` + $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $_cflags'" config/autoconf.mk fi rm -f config/autoconf.mk.bak fi