Bug 462467 - js/src/configure fails when building --with-system-nspr; r=ted.mielczarek
authorFabien Tassin <fta+bugzilla@sofaraway.org>
Fri, 31 Oct 2008 18:08:50 +0100
changeset 21152 ad5f67dc260100852434899edbb7d4eb874df8af
parent 21151 087c6fa28ecb5050037c15612b9b9bb853ae2456
child 21153 c700163db1611eb9bd841348abc314a3d46ce99b
push id3359
push usersgautherie.bz@free.fr
push dateFri, 31 Oct 2008 17:09:45 +0000
treeherdermozilla-central@ad5f67dc2601 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs462467
milestone1.9.1b2pre
Bug 462467 - js/src/configure fails when building --with-system-nspr; r=ted.mielczarek
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8281,18 +8281,20 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     fi
     rm -f config/autoconf.mk.bak
 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"
-ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
-ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
+if test -z "$MOZ_NATIVE_NSPR"; then
+    ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
+    ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
+fi
 ac_configure_args="$ac_configure_args --includedir=$dist/include"
 ac_configure_args="$ac_configure_args --bindir=$dist/bin"
 ac_configure_args="$ac_configure_args --libdir=$dist/lib"
 ac_configure_args="$ac_configure_args --with-sync-build-files=$srcdir"
 if test "$MOZ_MEMORY"; then
    ac_configure_args="$ac_configure_args --enable-jemalloc"  
 fi
 AC_OUTPUT_SUBDIRS(js/src)