3 files changed, 27 insertions, 3 deletions
diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript
index 2898be4..e8c1e25 100644
--- a/3rdParty/Expat/SConscript
+++ b/3rdParty/Expat/SConscript
@@ -7,5 +7,4 @@ if env.get("EXPAT_BUNDLED", False) :
 				"CPPPATH": [Dir("src")],
 				"LIBPATH": [Dir(".")],
-				"LIBS": ["Swiften_Expat"],
 			}
 
@@ -13,4 +12,7 @@ if env.get("EXPAT_BUNDLED", False) :
 		myenv = env.Clone()
 		myenv.Append(CPPDEFINES = ["XML_STATIC", "HAVE_EXPAT_CONFIG_H"])
+		if env.get("BOOST_BUNDLED", False) :
+			myenv.Append(CPPPATH = [".", "src", "../Boost/src"])
+		else :
 			myenv.Append(CPPPATH = [".", "src"])
 
@@ -20,5 +22,5 @@ if env.get("EXPAT_BUNDLED", False) :
 		conf.Finish()
 
-		myenv.StaticLibrary("Swiften_Expat", [
+		env["EXPAT_OBJECTS"] = myenv.SwiftenObject([
 				"src/xmltok.c",
 				"src/xmlparse.c",
diff --git a/3rdParty/Expat/expat_config.h b/3rdParty/Expat/expat_config.h
index fb87f9a..f102a51 100644
--- a/3rdParty/Expat/expat_config.h
+++ b/3rdParty/Expat/expat_config.h
@@ -2,4 +2,4 @@
 #define XML_NS 1
 
-#include "../Boost/src/boost/detail/endian.hpp"
+#include <boost/detail/endian.hpp>
 #define BYTEORDER BOOST_BYTE_ORDER
diff --git a/3rdParty/Expat/src/COPYING b/3rdParty/Expat/src/COPYING
new file mode 100644
index 0000000..dcb4506
--- /dev/null
+++ b/3rdParty/Expat/src/COPYING
@@ -0,0 +1,22 @@
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                               and Clark Cooper
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.