[or-cvs] r20424: {torbrowser} We're going to try to automate this as much as possible by a (torbrowser/trunk/build-scripts)

[ioerror@xxxxxxxx]

Author: ioerror
Date: 2009-08-28 02:54:24 -0400 (Fri, 28 Aug 2009)
New Revision: 20424

Modified:
   torbrowser/trunk/build-scripts/Makefile.linux
Log:
We're going to try to automate this as much as possible by adding -confirm-license -opensource to the Qt build...


Modified: torbrowser/trunk/build-scripts/Makefile.linux
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.linux	2009-08-28 06:48:50 UTC (rev 20423)
+++ torbrowser/trunk/build-scripts/Makefile.linux	2009-08-28 06:54:24 UTC (rev 20424)
@@ -111,9 +111,8 @@
 	cd $(OPENSSL_DIR) && make
 	cd $(OPENSSL_DIR) && make install
 
-# We'll probably want to add '-confirm-license -opensource' at some point
 QT_DIR=$(FETCH_DIR)/qt-x11-opensource-src-$(QT_VER)/
-QT_BUILD_PREFS=-system-zlib -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples
+QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples
 QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib/
 build-qt:
 	cd $(QT_DIR) && ./configure $(QT_OPTS)