Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-08-19 18:15:25 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-19 18:15:25 (GMT) |
| commit | 4f5a6af54be1486517a7825e71b41c3bdab8f31e (patch) | |
| tree | 8adb1c33475a4105d78c10e9a3ba1d6788f798f5 | |
| parent | 3a7c72e4d4ef968f87425b3394eb5e2aa7882e20 (diff) | |
| download | swift-4f5a6af54be1486517a7825e71b41c3bdab8f31e.zip swift-4f5a6af54be1486517a7825e71b41c3bdab8f31e.tar.bz2 | |
Give LibXML priority over Expat.
| -rw-r--r-- | .project | 20 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 33 |
2 files changed, 27 insertions, 26 deletions
@@ -77,7 +77,7 @@ </natures> <filteredResources> <filter> - <id>1282232084903</id> + <id>1282241138279</id> <name></name> <type>22</type> <matcher> @@ -86,7 +86,7 @@ </matcher> </filter> <filter> - <id>1282232084906</id> + <id>1282241138280</id> <name></name> <type>22</type> <matcher> @@ -95,7 +95,7 @@ </matcher> </filter> <filter> - <id>1282232084909</id> + <id>1282241138282</id> <name></name> <type>22</type> <matcher> @@ -104,7 +104,7 @@ </matcher> </filter> <filter> - <id>1282232084912</id> + <id>1282241138283</id> <name></name> <type>22</type> <matcher> @@ -113,7 +113,7 @@ </matcher> </filter> <filter> - <id>1282232084914</id> + <id>1282241138306</id> <name></name> <type>22</type> <matcher> @@ -122,7 +122,7 @@ </matcher> </filter> <filter> - <id>1282232084917</id> + <id>1282241138307</id> <name></name> <type>22</type> <matcher> @@ -131,12 +131,12 @@ </matcher> </filter> <filter> - <id>1282231206287</id> - <name>3rdParty/Boost</name> - <type>26</type> + <id>1282241138308</id> + <name></name> + <type>10</type> <matcher> <id>org.eclipse.ui.ide.multiFilter</id> - <arguments>1.0-name-matches-false-false-src</arguments> + <arguments>1.0-name-matches-false-false-.sconf_temp</arguments> </matcher> </filter> </filteredResources> diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index ce47b08..abe8860 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -264,11 +264,6 @@ if conf.CheckLib("c") : if conf.CheckLib("resolv") : env.Append(LIBS = ["resolv"]) -# Expat -if conf.CheckCHeader("expat.h") and conf.CheckLib("expat") : - env["HAVE_EXPAT"] = 1 - env["EXPAT_FLAGS"] = { "LIBS": ["expat"] } - # LibIDN if conf.CheckCHeader("idna.h") and conf.CheckLib("idn") : env["LIBIDN_FLAGS"] = { "LIBS": ["idn"] } @@ -342,21 +337,27 @@ if env["PLATFORM"] == "darwin" : conf.Finish() # LibXML -if not env.get("HAVE_EXPAT", False) : - conf = Configure(conf_env) +conf = Configure(conf_env) +if conf.CheckCHeader("libxml/parser.h") and conf.CheckLib("xml2") : + env["HAVE_LIBXML"] = 1 + env["LIBXML_FLAGS"] = { "LIBS": ["xml2"] } +conf.Finish() + +if not env.get("HAVE_LIBXML", 0) : + libxml_env = conf_env.Clone() + libxml_env.Append(CPPPATH = ["/usr/include/libxml2"]) + conf = Configure(libxml_env) if conf.CheckCHeader("libxml/parser.h") and conf.CheckLib("xml2") : env["HAVE_LIBXML"] = 1 - env["LIBXML_FLAGS"] = { "LIBS": ["xml2"] } + env["LIBXML_FLAGS"] = { "CPPPATH": ["/usr/include/libxml2"], "LIBS": ["xml2"] } conf.Finish() - if not env.get("HAVE_LIBXML", 0) : - libxml_env = conf_env.Clone() - libxml_env.Append(CPPPATH = ["/usr/include/libxml2"]) - conf = Configure(libxml_env) - if conf.CheckCHeader("libxml/parser.h") and conf.CheckLib("xml2") : - env["HAVE_LIBXML"] = 1 - env["LIBXML_FLAGS"] = { "CPPPATH": ["/usr/include/libxml2"], "LIBS": ["xml2"] } - conf.Finish() +# Expat +conf = Configure(conf_env) +if not env.get("HAVE_LIBXML",0) and conf.CheckCHeader("expat.h") and conf.CheckLib("expat") : + env["HAVE_EXPAT"] = 1 + env["EXPAT_FLAGS"] = { "LIBS": ["expat"] } +conf.Finish() # Bundled expat bundledExpat = False |