Fix building without libsoup.

Documentation building either globally or per project.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1574 a436a847-0d15-0410-975c-d299462d15a1

5 files changed, 18 insertions, 13 deletions

diff --git a/src/client/wscript b/src/client/wscript
index 9a010b84..319da3fb 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -15,16 +15,16 @@ def build(bld):
 		client.cpp
 	'''
 
-	if bld.env()['HAVE_SOUP']:
+	if bld.env()['HAVE_SOUP'] == 1:
 		obj.source += '''
 			HTTPClientReceiver.cpp
 			HTTPEngineSender.cpp
 		'''
-
-	if bld.env()['HAVE_XML2']:
+	
+	if bld.env()['HAVE_XML2'] == 1:
 		obj.source += ' DeprecatedLoader.cpp '
 
-	if bld.env()['HAVE_LIBLO']:
+	if bld.env()['HAVE_LIBLO'] == 1:
 		obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp '
 
 	obj.includes = ['..', '../common']
diff --git a/src/engine/EngineStore.cpp b/src/engine/EngineStore.cpp
index 9fcd3806..0140f201 100644
--- a/src/engine/EngineStore.cpp
+++ b/src/engine/EngineStore.cpp
@@ -77,11 +77,7 @@ EngineStore::find_object(const Path& path)
 void
 EngineStore::add(GraphObject* obj)
 {
-	GraphObjectImpl* o = dynamic_cast<GraphObjectImpl*>(obj);
-	assert(o);
-
 	assert(ThreadManager::current_thread_id() == THREAD_PRE_PROCESS);
-
 	Store::add(obj);
 }
 
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp
index e8584597..e57312ad 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/engine/EventBuffer.cpp
@@ -203,8 +203,8 @@ EventBuffer::append(uint32_t       frames,
 bool
 EventBuffer::append(const LV2_Event_Buffer* buf)
 {
-	uint8_t** data;
-	bool      ret = true;
+	uint8_t** data = NULL;
+	bool      ret  = true;
 
 	LV2_Event_Iterator iter;
 	for (lv2_event_begin(&iter, _buf); lv2_event_is_valid(&iter); lv2_event_increment(&iter)) {
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 5600a0b2..dca29a2d 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -28,9 +28,13 @@
 #include "engine/tuning.hpp"
 #include "engine/Engine.hpp"
 #include "engine/QueuedEngineInterface.hpp"
-#include "client/OSCClientReceiver.hpp"
+#ifdef HAVE_SOUP
 #include "client/HTTPClientReceiver.hpp"
+#endif
+#ifdef HAVE_LIBLO
+#include "client/OSCClientReceiver.hpp"
 #include "client/OSCEngineSender.hpp"
+#endif
 #include "client/ThreadedSigClientInterface.hpp"
 #include "client/ClientStore.hpp"
 #include "client/PatchModel.hpp"
@@ -155,6 +159,7 @@ ConnectWindow::connect(bool existing)
 		
 	Ingen::Shared::World* world = App::instance().world();
 
+#ifdef HAVE_LIBLO
 	if (_mode == CONNECT_REMOTE) {
 		if (!existing) {
 			const string url = (_widgets_loaded ? (string)_url_entry->get_text() : world->engine->uri());
@@ -168,8 +173,10 @@ ConnectWindow::connect(bool existing)
 		const string& scheme = uri.substr(0, uri.find(":"));
 		if (scheme == "osc.udp" || scheme == "osc.tcp")
 			client = SharedPtr<OSCClientReceiver>(new OSCClientReceiver(16181, tsci)); // FIXME: port
+#ifdef HAVE_SOUP
 		else if (scheme == "http")
 			client = SharedPtr<HTTPClientReceiver>(new HTTPClientReceiver(world, uri, tsci));
+#endif
 		
 		App::instance().attach(tsci, client);
 		App::instance().register_callbacks();
@@ -202,7 +209,9 @@ ConnectWindow::connect(bool existing)
 			cerr << "Failed to launch ingen process." << endl;
 		}
 
-	} else if (_mode == INTERNAL) {
+	} else
+#endif
+	if (_mode == INTERNAL) {
 		Ingen::Shared::World* world = App::instance().world();
 		if ( ! world->local_engine) {
 			assert(_new_engine);
diff --git a/src/gui/wscript b/src/gui/wscript
index c4cf8302..4965f257 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -38,7 +38,7 @@ def build(bld):
 		gui.cpp
 	'''
 
-	if bld.env()['HAVE_CURL']:
+	if bld.env()['HAVE_CURL'] != 0:
 		obj.source += 'UploadPatchWindow.cpp'
 
 	obj.includes       = ['..', '../common']