summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-07-30 18:20:03 +0000
committerDavid Robillard <d@drobilla.net>2007-07-30 18:20:03 +0000
commit494ae3b6f629c251170163d89d803bceb2bc91e0 (patch)
treef5c01570c4c5857c2b1067ff3c7904104e6180c8
parentadd7dd9f6b1bc17519d7c64282a7f2295735951c (diff)
downloadlilv-494ae3b6f629c251170163d89d803bceb2bc91e0.tar.gz
lilv-494ae3b6f629c251170163d89d803bceb2bc91e0.tar.bz2
lilv-494ae3b6f629c251170163d89d803bceb2bc91e0.zip
Fix SLV2 config.h path stuff.
git-svn-id: http://svn.drobilla.net/lad/slv2@656 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--configure.ac2
-rw-r--r--hosts/lv2_jack_host.c3
-rw-r--r--src/world.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 56700e1..1e4eb24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/plugin.c])
AC_CONFIG_SRCDIR([slv2/plugin.h])
AC_CONFIG_SRCDIR([utils/lv2_list.c])
-AC_CONFIG_HEADER([config/slv2_config.h])
+AC_CONFIG_HEADER([config/config.h])
AM_INIT_AUTOMAKE
SLV2_SO_VERSION=${SLV2_API_CURRENT}:${SLV2_API_REVISION}:${SLV2_API_AGE}
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index c7992cb..c185e87 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -16,13 +16,14 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include CONFIG_H_PATH
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <slv2/slv2.h>
#include <jack/jack.h>
#include <jack/midiport.h>
-#include "../config/slv2_config.h"
#include "lv2-miditype.h"
#include "lv2-midifunctions.h"
#include "jack_compat.h"
diff --git a/src/world.c b/src/world.c
index 26ca852..e2b3574 100644
--- a/src/world.c
+++ b/src/world.c
@@ -16,6 +16,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include CONFIG_H_PATH
+
#define _XOPEN_SOURCE 500
#include <string.h>
#include <stdlib.h>
@@ -25,7 +27,6 @@
#include <slv2/world.h>
#include <slv2/slv2.h>
#include <slv2/util.h>
-#include "slv2_config.h"
#include "slv2_internal.h"