From aeaab905a0711aafef5a64a83a1a511d76f41842 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 3 Oct 2008 21:25:30 +0000
Subject: Make liblo optional for building ingen.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1608 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/HTTPClientReceiver.cpp |  1 -
 src/client/client.cpp             | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/client')

diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index ece55ab2..4773b7ce 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -20,7 +20,6 @@
 #include <cstring>
 #include <iostream>
 #include <sstream>
-#include <raul/AtomLiblo.hpp>
 #include "module/Module.hpp"
 #include "HTTPClientReceiver.hpp"
 
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5e452030..8e51fb23 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -19,7 +19,9 @@
 
 #include <iostream>
 #include "client.hpp"
+#ifdef WITH_LIBLO
 #include "OSCEngineSender.hpp"
+#endif
 #ifdef WITH_SOUP
 #include "HTTPEngineSender.hpp"
 #endif
@@ -34,21 +36,25 @@ SharedPtr<Ingen::Shared::EngineInterface>
 new_remote_interface(const std::string& url)
 {
 	const string scheme = url.substr(0, url.find(":"));
-	cout << "SCHEME: " << scheme << endl;
+
+#ifdef WITH_LIBLO
 	if (scheme == "osc.udp" || scheme == "osc.tcp") {
 		OSCEngineSender* oes = new OSCEngineSender(url);
 		oes->attach(rand(), true);
 		return SharedPtr<Shared::EngineInterface>(oes);
+	}
+#endif
+
 #ifdef WITH_SOUP
-	} else if (scheme == "http") {
+	if (scheme == "http") {
 		HTTPEngineSender* hes = new HTTPEngineSender(url);
 		hes->attach(rand(), true);
 		return SharedPtr<Shared::EngineInterface>(hes);
-#endif
-	} else {
-		cerr << "WARNING: Unknown URI scheme '" << scheme << "'" << endl;
-		return SharedPtr<Shared::EngineInterface>();
 	}
+#endif
+
+	cerr << "WARNING: Unknown URI scheme '" << scheme << "'" << endl;
+	return SharedPtr<Shared::EngineInterface>();
 }
 
 
-- 
cgit v1.2.1