From 5db4f44b621edcf957aa7bc194bc7de0aca4d5f5 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 23 Mar 2013 19:14:32 +0000
Subject: Fix check for LV2 1.4.1 when building recursively.

git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5096 a436a847-0d15-0410-975c-d299462d15a1
---
 src/x11_in_gtk2.c  | 12 ++++++------
 src/x11_in_qt4.cpp |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c
index 72bbee5..13986ce 100644
--- a/src/x11_in_gtk2.c
+++ b/src/x11_in_gtk2.c
@@ -32,7 +32,7 @@ struct _SuilX11Wrapper {
 	GtkPlug*                    plug;
 	SuilWrapper*                wrapper;
 	SuilInstance*               instance;
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	const LV2UI_Idle_Interface* idle_iface;
 #endif
 };
@@ -50,7 +50,7 @@ on_plug_removed(GtkSocket* sock, gpointer data)
 {
 	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(sock);
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	g_idle_remove_by_data(self);
 #endif
 
@@ -158,7 +158,7 @@ suil_x11_wrapper_init(SuilX11Wrapper* self)
 	self->plug       = GTK_PLUG(gtk_plug_new(0));
 	self->wrapper    = NULL;
 	self->instance   = NULL;
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	self->idle_iface = NULL;
 #endif
 }
@@ -170,7 +170,7 @@ wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
 	return 0;
 }
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 static gboolean
 suil_x11_wrapper_idle(void* data)
 {
@@ -192,7 +192,7 @@ wrapper_wrap(SuilWrapper*  wrapper,
 	wrap->wrapper         = wrapper;
 	wrap->instance        = instance;
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	const LV2UI_Idle_Interface* idle_iface = suil_instance_extension_data(
 		instance, LV2_UI__idleInterface);
 	if (idle_iface) {
@@ -246,7 +246,7 @@ suil_wrapper_new(SuilHost*      host,
 	suil_add_feature(features, &n_features, LV2_UI__resize,
 	                 &wrapper->resize);
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
 #endif
 
diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp
index 152b371..bd079ab 100644
--- a/src/x11_in_qt4.cpp
+++ b/src/x11_in_qt4.cpp
@@ -21,7 +21,7 @@
 #include "./suil_config.h"
 #include "./suil_internal.h"
 
-#ifndef HAVE_NEW_LV2
+#ifndef HAVE_LV2_1_4_1
 typedef struct _LV2UI_Idle_Interface LV2UI_Idle_Interface;
 #endif
 
@@ -40,7 +40,7 @@ public:
 		, _ui_timer(0)
 	{}
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	void showEvent(QShowEvent* event) {
 		if (_idle_iface && _ui_timer == 0) {
 			_ui_timer = this->startTimer(30);
@@ -68,7 +68,7 @@ wrapper_wrap(SuilWrapper*  wrapper,
              SuilInstance* instance)
 {
 	const LV2UI_Idle_Interface* idle_iface = NULL;
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	idle_iface = (const LV2UI_Idle_Interface*)suil_instance_extension_data(
 		instance, LV2_UI__idleInterface);
 #endif
@@ -113,7 +113,7 @@ suil_wrapper_new(SuilHost*      host,
 	suil_add_feature(features, &n_features, LV2_UI__resize,
 	                 &wrapper->resize);
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_4_1
 	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
 #endif
 
-- 
cgit v1.2.1