From 355ce81bf6f4fe1b0c155a1f7420bc0d450a5dfc Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 15 Mar 2011 22:41:56 +0000
Subject: Remove autowaf external (broken intermediary revision).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3095 a436a847-0d15-0410-975c-d299462d15a1
---
 src/engine/wscript | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/engine')

diff --git a/src/engine/wscript b/src/engine/wscript
index 0cbd060c..47a55079 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 
 def build(bld):
 	# Headers
@@ -59,7 +59,7 @@ def build(bld):
 		internals/Trigger.cpp
 	'''
 	
-	if bld.env['HAVE_SLV2'] == 1:
+	if bld.is_defined('HAVE_SLV2'):
 		core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
 
 	obj = bld(features = 'cxx cxxshlib')
@@ -73,7 +73,7 @@ def build(bld):
 	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL SORD'
 	autowaf.use_lib(bld, obj, core_libs)
 
-	if bld.env['HAVE_SOUP'] == 1:
+	if bld.is_defined('HAVE_SOUP'):
 		obj = bld(features = 'cxx cxxshlib')
 		obj.source = '''
 			EventSource.cpp
@@ -88,7 +88,7 @@ def build(bld):
 		obj.install_path = '${LIBDIR}'
 		autowaf.use_lib(bld, obj, core_libs + ' SOUP')
 
-	if bld.env['HAVE_LIBLO'] == 1:
+	if bld.is_defined('HAVE_LIBLO'):
 		obj = bld(features = 'cxx cxxshlib')
 		obj.source = '''
 			EventSource.cpp
@@ -104,7 +104,7 @@ def build(bld):
 		obj.install_path    = '${LIBDIR}'
 		autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
 
-	if bld.env['HAVE_JACK'] == 1:
+	if bld.is_defined('HAVE_JACK'):
 		obj = bld(features = 'cxx cxxshlib')
 		obj.source = 'JackDriver.cpp ingen_jack.cpp'
 		obj.export_includes = ['.']
-- 
cgit v1.2.1