Waf building of taglib and vamp-sdk.

git-svn-id: svn://localhost/ardour2/branches/3.0@4660 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 2 deletions

diff --git a/autowaf.py b/autowaf.py
index c821ee8cc2..df6b43beff 100644
--- a/autowaf.py
+++ b/autowaf.py
@@ -89,9 +89,12 @@ def check_tool(conf, name):
 		conf.check_tool(name)
 		checked[name] = True
 
+def nameify(name):
+	return name.replace('/', '_').replace('++', 'PP').replace('-', '_')
+
 def check_pkg(conf, name, **args):
 	"Check for a package iff it hasn't been checked for yet"
-	var_name = 'HAVE_' + args['uselib_store'].replace('/', '_').replace('++', 'PP')
+	var_name = 'HAVE_' + nameify(args['uselib_store'])
 	check = not var_name in conf.env
 	if not check and 'atleast_version' in args:
 		# Re-check if version is newer than previous check
@@ -198,7 +201,7 @@ def configure(conf):
 	g_step = 2
 	
 def set_local_lib(conf, name, has_objects):
-	conf.define('HAVE_' + name.upper().replace('/', '_').replace('++', 'PP'), 1)
+	conf.define('HAVE_' + nameify(name.upper()), 1)
 	if has_objects:
 		if type(conf.env['AUTOWAF_LOCAL_LIBS']) != dict:
 			conf.env['AUTOWAF_LOCAL_LIBS'] = {}