New commits:
commit a439a881a7b54f985cc1a546a51adbe0fbd46591
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
xulrunner: Fixed to build against system nspr/nss if nss
>= 3.12 installed.
+if spell_ok nss && [[ $(installed_version nss) == 3.12* ]]; then
+ sed -i '15iac_add_options --with-system-nspr' .mozconfig &&
+ sed -i '15iac_add_options --with-system-nss' .mozconfig
+fi &&
+
if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '24iac_add_options --enable-official-branding' .mozconfig
fi
diff --git a/http/xulrunner/mozconfig3 b/http/xulrunner/mozconfig3
index 3806632..b5d9e65 100644
--- a/http/xulrunner/mozconfig3
+++ b/http/xulrunner/mozconfig3
@@ -9,10 +9,6 @@
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --with-pthreads
-# These cause breakage when building apps
-ac_add_options --with-system-nspr
-ac_add_options --without-system-nss
-
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --with-system-zlib
[SM-Commit] GIT changes to master grimoire by George Sherwood (a439a881a7b54f985cc1a546a51adbe0fbd46591),
George Sherwood, 11/13/2008