summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-11 17:07:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-11 17:07:26 (GMT)
commitc1dd2a64376ee4e7828ca4cb34c3a9a38034073e (patch)
treed06b3cdad5eb11205661e03d0b60da89ec7cc392 /3rdParty
parentd721b7a3d6314731c120cf77722572cb28570992 (diff)
downloadswift-c1dd2a64376ee4e7828ca4cb34c3a9a38034073e.zip
swift-c1dd2a64376ee4e7828ca4cb34c3a9a38034073e.tar.bz2
Make OpenSSL required for Swift.
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/Expat/SConscript4
-rw-r--r--3rdParty/LibIDN/SConscript4
2 files changed, 4 insertions, 4 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index cf7b684..8220f01 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -1,4 +1,4 @@
-Import("env")
+Import(["env", "conf_env")
env["EXPAT_FLAGS"] = {
"CPPDEFINES": ["XML_STATIC"],
@@ -11,7 +11,7 @@ myenv = env.Clone()
myenv.Append(CPPDEFINES = ["XML_STATIC", "HAVE_EXPAT_CONFIG_H"])
myenv.Append(CPPPATH = [".", "src"])
-conf = Configure(myenv)
+conf = Configure(conf_env)
if conf.CheckFunc('memmove') :
myenv.Append(CPPDEFINES = ["HAVE_MEMMOVE"])
conf.Finish()
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
index 5853a85..fa8f870 100644
--- a/3rdParty/LibIDN/SConscript
+++ b/3rdParty/LibIDN/SConscript
@@ -18,13 +18,13 @@ if not conf.CheckFunc('strcasecmp') :
if conf.CheckFunc("stricmp") :
myenv.Append(CPPDEFINES = [("strcasecmp", "stricmp")])
else :
- print "Cannot find strcasecmp() or stricmp()"
+ print "Error: Cannot find strcasecmp() or stricmp()"
Exit(1)
if not conf.CheckFunc('strncasecmp') :
if conf.CheckFunc("strnicmp") :
myenv.Append(CPPDEFINES = [("strncasecmp", "strnicmp")])
else :
- print "Cannot find strncasecmp() or strnicmp()"
+ print "Error: Cannot find strncasecmp() or strnicmp()"
Exit(1)
conf.Finish()