Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-06 17:14:13 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-06 17:14:13 (GMT) |
| commit | 65656b483fb72582a88784f20d0ad21ffefa6b65 (patch) | |
| tree | 3d0ee2bb7357ba2d55a09440bdb3c8f4270cfa7f /BuildTools | |
| parent | 37e576b9980c0edc0eee2d5bb691f0a353a62b60 (diff) | |
| download | swift-65656b483fb72582a88784f20d0ad21ffefa6b65.zip swift-65656b483fb72582a88784f20d0ad21ffefa6b65.tar.bz2 | |
Make expat libname a config option.
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 136c7ed..fb90d69 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -35,8 +35,9 @@ if os.name == "nt" : vars.Add(PackageVariable("bonjour", "Bonjour SDK location", "yes")) vars.Add(PackageVariable("openssl", "OpenSSL location", "yes")) vars.Add(PackageVariable("boost", "Boost location", "yes")) -vars.Add(PathVariable("expat_libdir", "Expat library location", None, PathVariable.PathAccept)) vars.Add(PathVariable("expat_includedir", "Expat headers location", None, PathVariable.PathAccept)) +vars.Add(PathVariable("expat_libdir", "Expat library location", None, PathVariable.PathAccept)) +vars.Add("expat_libname", "Expat library name", "libexpat" if os.name == "nt" else "expat") vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept)) vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept)) vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept)) @@ -463,15 +464,11 @@ if not env.get("HAVE_LIBXML",0) : expat_flags["LIBPATH"] = [env["expat_libdir"]] if env.get("expat_includedir", None) : expat_flags["CPPPATH"] = [env["expat_includedir"]] - if env["PLATFORM"] == "win32" : - expat_libname = "libexpat" - else : - expat_libname = "expat" expat_conf_env.MergeFlags(expat_flags) conf = Configure(expat_conf_env) - if conf.CheckCHeader("expat.h") and conf.CheckLib(expat_libname) : + if conf.CheckCHeader("expat.h") and conf.CheckLib(env["expat_libname"]) : env["HAVE_EXPAT"] = 1 - env["EXPAT_FLAGS"] = { "LIBS": [expat_libname] } + env["EXPAT_FLAGS"] = { "LIBS": [env["expat_libname"]] } env["EXPAT_FLAGS"].update(expat_flags) conf.Finish() |