From a6104246c55cd567d67fb512098ff80d25dc8837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 11 Aug 2009 19:29:21 +0200
Subject: Add Qt scons variable.


diff --git a/.gitignore b/.gitignore
index 977cb61..bdad5c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
 moc_*
 qrc_*
 ui_*
+config.py
 checker
 aclocal.m4
 autom4te.cache
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index 8220f01..3e3b751 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -1,4 +1,4 @@
-Import(["env", "conf_env")
+Import(["env", "conf_env"])
 
 env["EXPAT_FLAGS"] = {
 		"CPPDEFINES": ["XML_STATIC"],
diff --git a/SConstruct b/SConstruct
index 70a9cac..1d8c2d6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -14,6 +14,7 @@ if os.name != "nt" :
 if os.name == "mac" :
   vars.Add(BoolVariable("universal", "Create universal binaries", "no"))
 vars.Add(PackageVariable("openssl", "OpenSSL location", "yes"))
+vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
 
 ################################################################################
 # Set up default build & configure environment
@@ -141,6 +142,7 @@ if conf.CheckCHeader("expat.h") and conf.CheckLib("expat") :
 
 conf.Finish()
 
+# Bundled expat
 bundledExpat = False
 if not env.get("HAVE_EXPAT", 0) :
 	print "Expat or LibXML not found. Using bundled Expat"
@@ -148,6 +150,10 @@ if not env.get("HAVE_EXPAT", 0) :
 	env["HAVE_EXPAT"] = 1
 	bundledExpat = True
 
+# Qt
+if env["qt"] :
+	env["QTDIR"] = env["qt"]
+
 # OpenSSL
 openssl_env = conf_env.Clone()
 use_openssl = bool(env["openssl"])
diff --git a/Swift/SConscript b/Swift/SConscript
index c0b14bf..75db94d 100644
--- a/Swift/SConscript
+++ b/Swift/SConscript
@@ -1,6 +1,6 @@
 Import("env")
 
-if not env.get("HAVE_OPENSSL", 0) :
+if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) :
   print "Error: Swift requires OpenSSL support, and OpenSSL was not found."
   Exit(1)
 
-- 
cgit v0.10.2-6-g49f6