Backout e80c939cc639 (bug 729067) for bustage
authorEd Morley <bmo@edmorley.co.uk>
Tue, 21 Feb 2012 15:04:10 +0000
changeset 90173 7dda043db5711bfc8665328e5a5d5a8924b4432f
parent 90172 8610a9da1742496b7f1adf3d57b2396649812e24
child 90174 9964bcbdc4e2d33928b215dcb8518b5d3b22d16b
push idunknown
push userunknown
push dateunknown
bugs729067
milestone13.0a1
backs oute80c939cc6393609a9b609339ad24a1d7a310355
Backout e80c939cc639 (bug 729067) for bustage
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9195,30 +9195,32 @@ if test -z "$MOZ_NATIVE_NSPR"; then
        NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
        $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
        NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
        $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk
     fi
     rm -f config/autoconf.mk.bak
 fi
 
-dnl ========================================================
-dnl = Setup a nice relatively clean build environment for
-dnl = sub-configures.
-dnl ========================================================
-export CC="$_SUBDIR_CC"
-export CXX="$_SUBDIR_CXX"
-export CFLAGS="$_SUBDIR_CFLAGS"
-export CPPFLAGS="$_SUBDIR_CPPFLAGS"
-export CXXFLAGS="$_SUBDIR_CXXFLAGS"
-export LDFLAGS="$_SUBDIR_LDFLAGS"
-export HOST_CC="$_SUBDIR_HOST_CC"
-export HOST_CFLAGS="$_SUBDIR_HOST_CFLAGS"
-export HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
-export RC=
+if test -n "$direct_nspr_config"; then
+    dnl ========================================================
+    dnl = Setup a nice relatively clean build environment for
+    dnl = sub-configures.
+    dnl ========================================================
+    CC="$_SUBDIR_CC"
+    CXX="$_SUBDIR_CXX"
+    CFLAGS="$_SUBDIR_CFLAGS"
+    CPPFLAGS="$_SUBDIR_CPPFLAGS"
+    CXXFLAGS="$_SUBDIR_CXXFLAGS"
+    LDFLAGS="$_SUBDIR_LDFLAGS"
+    HOST_CC="$_SUBDIR_HOST_CC"
+    HOST_CFLAGS="$_SUBDIR_HOST_CFLAGS"
+    HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
+    RC=
+fi
 
 # Run the SpiderMonkey 'configure' script.
 dist=$MOZ_BUILD_ROOT/dist
 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 ac_configure_args="$ac_configure_args --enable-threadsafe"
 if test "$BUILD_CTYPES"; then
     # Build js-ctypes on the platforms we can.
     ac_configure_args="$ac_configure_args --enable-ctypes"