From 68edf261fe04b114094539ab0cb4ccd93da8af51 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 16 Dec 2010 23:24:20 +0000
Subject: Fix machina compilation.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2727 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/wscript |  4 ++--
 wscript         | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/gui/wscript b/src/gui/wscript
index 78e94d9..230114c 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -33,10 +33,10 @@ def build(bld):
 	bld.install_files('${DATADIR}/machina', 'machina.svg')
 
 	# Executable
-	obj = bld.new_task_gen('cxx', 'program')
+	obj = bld(features = 'cxx cxxprogram')
 	obj.target   = 'machina_gui'
 	obj.source   = 'main.cpp'
 	obj.includes = ['.', '../engine']
-	obj.defines  = 'VERSION=\\\"' + bld.env['MACHINA_VERSION'] + '\\\"'
+	obj.defines  = 'VERSION="' + bld.env['MACHINA_VERSION'] + '"'
 	obj.use      = 'libmachina_engine libmachina_gui'
 	autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL MACHINA EUGENE FLOWCANVAS')
diff --git a/wscript b/wscript
index 1ad8284..a2f49fb 100644
--- a/wscript
+++ b/wscript
@@ -27,34 +27,31 @@ def configure(conf):
 	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
 			atleast_version='2.11.12', mandatory=False)
 	autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
-			atleast_version='0.109.0', mandatory=True)
+			  atleast_version='0.109.0', mandatory=True)
 	autowaf.check_pkg(conf, 'raul', uselib_store='RAUL',
 			atleast_version='0.5.1', mandatory=True)
 	autowaf.check_pkg(conf, 'flowcanvas', uselib_store='FLOWCANVAS',
 			atleast_version='0.5.1', mandatory=False)
 	autowaf.check_pkg(conf, 'libglademm-2.4', uselib_store='GLADEMM',
 			atleast_version='2.6.0', mandatory=False)
+	autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL', mandatory=False)
 	autowaf.check_pkg(conf, 'redlandmm', uselib_store='REDLANDMM',
 			atleast_version='0.0.0', mandatory=False)
 	autowaf.check_pkg(conf, 'eugene', uselib_store='EUGENE',
 			atleast_version='0.0.0', mandatory=False)
 
 	# Check for posix_memalign (OSX, amazingly, doesn't have it)
-	conf.check(
-			function_name='posix_memalign',
-			header_name='stdlib.h',
-			define_name='HAVE_POSIX_MEMALIGN')
+	conf.check(function_name='posix_memalign',
+		   header_name='stdlib.h',
+		   define_name='HAVE_POSIX_MEMALIGN')
 
 	build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1
 
 	autowaf.define(conf, 'MACHINA_PPQN', 19200)
-
 	autowaf.define(conf, 'MACHINA_VERSION', MACHINA_VERSION)
 	autowaf.define(conf, 'BUILD_MACHINA_GUI', int(build_gui))
-	if conf.env['BUNDLE']:
-		autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(conf.env['DATADIRNAME'] + 'machina'))
-	else:
-		autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(conf.env['DATADIR'], 'machina'))
+	autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(
+			conf.env['DATADIR'], 'machina'))
 
 	conf.write_config_header('machina-config.h', remove=False)
 
-- 
cgit v1.2.1