[Fedora-directory-commits] esc/src/xulrunner Makefile,1.4,1.5

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1249

Modified Files:
	Makefile 
Log Message:
Add flag to control whether or not to build with the system NSS and NSPR for Linux.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	25 Jan 2007 22:37:42 -0000	1.4
+++ Makefile	9 Feb 2007 21:33:40 -0000	1.5
@@ -67,9 +67,11 @@
 	echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
 	echo "ac_add_options --enable-xft" >> $@.$(TYPE)
 	echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
+ifndef NO_SYSTEM_NSS 
 	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
 	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
 endif
+endif
 ifeq ($(OS_ARCH),Darwin)
 	echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
 	echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)