summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-08-20 05:13:37 +0000
committerDavid Robillard <d@drobilla.net>2008-08-20 05:13:37 +0000
commitb0471f840eb93a9c01df8d662386902a28bac265 (patch)
tree4a41454fb2e554719f4b9dcb54bec90e4dca2b0a
parentdcf14b6d4ed9281409196ac92e15c31b40abf179 (diff)
downloadingen-b0471f840eb93a9c01df8d662386902a28bac265.tar.gz
ingen-b0471f840eb93a9c01df8d662386902a28bac265.tar.bz2
ingen-b0471f840eb93a9c01df8d662386902a28bac265.zip
Fix building without libsoup. Again.
git-svn-id: http://svn.drobilla.net/lad/ingen@1457 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--configure.ac8
-rw-r--r--src/bindings/Client.hpp6
-rw-r--r--src/libs/client/Makefile.am12
3 files changed, 15 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index d5261794..d87ec176 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,9 +338,9 @@ AC_MSG_RESULT([])
AC_MSG_RESULT([**********************************************************************])
AC_MSG_RESULT([Configuration:])
AC_MSG_RESULT([])
-AC_MSG_RESULT([Jack support: $build_jack])
-AC_MSG_RESULT([LV2 Plugin support: $build_lv2])
-AC_MSG_RESULT([LADSPA Plugin support: $build_ladspa])
+AC_MSG_RESULT([Jack support: $build_jack])
+AC_MSG_RESULT([LV2 Plugin support: $build_lv2])
+AC_MSG_RESULT([LADSPA Plugin support: $build_ladspa])
AC_MSG_RESULT([])
AC_MSG_RESULT([Ingen:])
AC_MSG_RESULT([ Denormal fixes (assembly): $assembly])
@@ -348,6 +348,8 @@ AC_MSG_RESULT([ Engine library/OSC server: $build_ingen_server])
AC_MSG_RESULT([ JACK in-process engine: $build_in_process_engine])
AC_MSG_RESULT([ Client library: $build_ingen_client_lib])
AC_MSG_RESULT([ GTK GUI: $build_ingen_gtk_client])
+AC_MSG_RESULT([ OSC interface (via liblo): yes])
+AC_MSG_RESULT([ HTTP interface (libsoup): $build_http])
AC_MSG_RESULT([ Language bindings: $bindings])
AC_MSG_RESULT([])
AC_MSG_RESULT([*** INGEN IS WITHOUT LASH SUPPORT AT THIS TIME ***])
diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp
index e098e4ef..eb772524 100644
--- a/src/bindings/Client.hpp
+++ b/src/bindings/Client.hpp
@@ -45,10 +45,8 @@ public:
virtual void new_patch(const std::string& path, uint32_t poly) {}
- virtual void new_node(const std::string& plugin_uri,
- const std::string& node_path,
- bool is_polyphonic,
- uint32_t num_ports) {}
+ virtual void new_node(const std::string& path,
+ const std::string& plugin_uri) {}
virtual void new_port(const std::string& path,
uint32_t index,
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 565c94cf..4af7c243 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -35,10 +35,6 @@ libingen_client_la_SOURCES = \
ConnectionModel.hpp \
DeprecatedLoader.cpp \
DeprecatedLoader.hpp \
- HTTPClientReceiver.cpp \
- HTTPClientReceiver.hpp \
- HTTPEngineSender.cpp \
- HTTPEngineSender.hpp \
NodeModel.cpp \
NodeModel.hpp \
OSCClientReceiver.cpp \
@@ -61,5 +57,13 @@ libingen_client_la_SOURCES = \
client.cpp \
client.hpp
+if WITH_SOUP
+libingen_client_la_SOURCES += \
+ HTTPClientReceiver.cpp \
+ HTTPClientReceiver.hpp \
+ HTTPEngineSender.cpp \
+ HTTPEngineSender.hpp
+endif
+
endif # BUILD_CLIENT_LIB