2 files changed, 12 insertions, 5 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript
index 27dfc2e..837884b 100644
--- a/Swiften/Config/SConscript
+++ b/Swiften/Config/SConscript
@@ -37,12 +37,18 @@ config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags)
 
 config_env = env.Clone()
 # Create a local copy of Paths.cpp to avoid a Swiften dependency
-config_env.Install(".", "#/Swiften/Base/Paths.cpp")
+config_env.Install(".", [
+	"#/Swiften/Base/Paths.cpp",
+	"#/Swiften/Base/Path.cpp",
+	"#/Swiften/Base/String.cpp",
+])
 config_env.UseFlags(config_env["BOOST_FLAGS"])
 config_env.UseFlags(config_env["PLATFORM_FLAGS"])
 config_env.WriteVal("swiften-config.h", config_env.Value(config_flags))
 swiften_config = config_env.Program("swiften-config", [
 		"Paths.cpp",
+		"Path.cpp",
+		"String.cpp",
 		"swiften-config.cpp"
 	])
 
diff --git a/Swiften/Config/swiften-config.cpp b/Swiften/Config/swiften-config.cpp
index 89df9cd..778134d 100644
--- a/Swiften/Config/swiften-config.cpp
+++ b/Swiften/Config/swiften-config.cpp
@@ -16,6 +16,7 @@
 
 #include <Swiften/Base/Platform.h>
 #include <Swiften/Base/Paths.h>
+#include <Swiften/Base/Path.h>
 #include <Swiften/Version.h>
 
 #include "swiften-config.h"
@@ -90,12 +91,12 @@ int main(int argc, char* argv[]) {
 	for(size_t i = 0; i < libs.size(); ++i) {
 		if (inPlace) {
 			std::string lib = libs[i];
-			boost::replace_all(lib, "#", topSourcePath.string());
+			boost::replace_all(lib, "#", pathToString(topSourcePath));
 			libs[i] = lib;
 		}
 		else {
 			std::string lib = libs[i];
-			boost::replace_all(lib, "#", (topInstallPath / "lib").string());
+			boost::replace_all(lib, "#", pathToString(topInstallPath / "lib"));
 			boost::erase_all(lib, "/Swiften");
 			libs[i] = lib;
 		}
@@ -103,12 +104,12 @@ int main(int argc, char* argv[]) {
 	for(size_t i = 0; i < cflags.size(); ++i) {
 		if (inPlace) {
 			std::string cflag = cflags[i];
-			boost::replace_all(cflag, "#", topSourcePath.string());
+			boost::replace_all(cflag, "#", pathToString(topSourcePath));
 			cflags[i] = cflag;
 		}
 		else {
 			std::string cflag = cflags[i];
-			boost::replace_all(cflag, "#", (topInstallPath / "include").string());
+			boost::replace_all(cflag, "#", pathToString(topInstallPath / "include"));
 			cflags[i] = cflag;
 		}
 	}