From 39b61955e4db79b7e152f15ebe8326056e6d038b Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 16 Dec 2010 21:39:53 +0000
Subject: Fix use of conf.define and subsequent check in conf.env (no longer
 works with waf 1.6) (fix ticket #610).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2724 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/wscript |  2 +-
 wscript         | 21 +++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/gui/wscript b/src/gui/wscript
index 9cccf0bc..5ae04233 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -3,7 +3,7 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/gui', bld.path.ant_glob('*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/gui', bld.path.ant_glob('*.hpp'))
 
 	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
diff --git a/wscript b/wscript
index c2dc9ab3..c46c6ce7 100644
--- a/wscript
+++ b/wscript
@@ -83,24 +83,21 @@ def configure(conf):
 
 	build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1
 
-	conf.define('INGEN_VERSION', INGEN_VERSION)
-	conf.env['INGEN_VERSION'] = INGEN_VERSION
-	conf.define('BUILD_INGEN_GUI', int(build_gui))
-	conf.define('HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1))
+	autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)
+	autowaf.define(conf, 'BUILD_INGEN_GUI', int(build_gui))
+	autowaf.define(conf, 'HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1))
 	if conf.env['BUNDLE']:
-		conf.define('INGEN_DATA_DIR', os.path.join(
-				conf.env['DATADIRNAME'], 'ingen'))
-		conf.define('INGEN_MODULE_DIR', conf.env['LIBDIRNAME'])
+		autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIRNAME'], 'ingen'))
+		autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIRNAME'])
 	else:
-		conf.define('INGEN_DATA_DIR', os.path.join(
-				conf.env['DATADIR'], 'ingen'))
-		conf.define('INGEN_MODULE_DIR',	conf.env['LIBDIR'])
+		autowaf.define(conf, 'INGEN_DATA_DIR', os.path.join(conf.env['DATADIR'], 'ingen'))
+		autowaf.define(conf, 'INGEN_MODULE_DIR', conf.env['LIBDIR'])
 	
 	if Options.options.log_debug:
-		conf.define('LOG_DEBUG', 1)
+		autowaf.define(conf, 'LOG_DEBUG', 1)
 	
 	if Options.options.liblo_bundles:
-		conf.define('LIBLO_BUNDLES', 1)
+		autowaf.define(conf, 'LIBLO_BUNDLES', 1)
 
 	conf.write_config_header('ingen-config.h', remove=False)
 
-- 
cgit v1.2.1