summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-12-21 17:04:40 +0000
committerDavid Robillard <d@drobilla.net>2008-12-21 17:04:40 +0000
commit108c0af7f15e1aeca657546518bed8180cd47ef6 (patch)
tree14ef65e1f43ac03427a7157ccbd3b6ffe6482fbb
parent41e78083edf87c3094bd2ebd5cf4475805e9b076 (diff)
downloadlilv-108c0af7f15e1aeca657546518bed8180cd47ef6.tar.gz
lilv-108c0af7f15e1aeca657546518bed8180cd47ef6.tar.bz2
lilv-108c0af7f15e1aeca657546518bed8180cd47ef6.zip
Change configuration header name to something less likely to conflict.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@1887 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--hosts/lv2_jack_host.c2
-rw-r--r--src/world.c2
-rw-r--r--utils/lv2_inspect.c2
-rw-r--r--utils/lv2_list.c2
-rw-r--r--wscript2
5 files changed, 5 insertions, 5 deletions
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index b3548b8..a7138e7 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include "wafconfig.h"
#define _XOPEN_SOURCE 500
#include <stdio.h>
diff --git a/src/world.c b/src/world.c
index 0ef6aaa..f93b732 100644
--- a/src/world.c
+++ b/src/world.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include "wafconfig.h"
#define _XOPEN_SOURCE 500
#include <string.h>
diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c
index 1a710ed..e28bc78 100644
--- a/utils/lv2_inspect.c
+++ b/utils/lv2_inspect.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include "wafconfig.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/utils/lv2_list.c b/utils/lv2_list.c
index 14aa5a9..6860dcf 100644
--- a/utils/lv2_list.c
+++ b/utils/lv2_list.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
+#include "wafconfig.h"
#include <stdio.h>
#include <string.h>
#include "slv2/slv2.h"
diff --git a/wscript b/wscript
index 56815a3..21cc399 100644
--- a/wscript
+++ b/wscript
@@ -52,7 +52,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'jack', destvar='JACK', vnum='0.107.0', mandatory=False)
conf.env.append_value('CCFLAGS', '-std=c99')
conf.define('SLV2_VERSION', SLV2_VERSION)
- conf.write_config_header('config.h')
+ conf.write_config_header('wafconfig.h')
conf.env['USE_JACK'] = conf.env['HAVE_JACK'] and not Options.options.no_jack
conf.env['BUILD_TESTS'] = Options.options.build_tests