summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-26 00:29:47 +0000
committerDavid Robillard <d@drobilla.net>2011-05-26 00:29:47 +0000
commitedcd7137e091df562f70daa1092f09d4e92f15a3 (patch)
treeef90c6a273320add58180d53aad05185e8101a45 /wscript
parente4da941faa92adf0c4dc3ae03d6598db7921f56b (diff)
downloadsord-edcd7137e091df562f70daa1092f09d4e92f15a3.tar.gz
sord-edcd7137e091df562f70daa1092f09d4e92f15a3.tar.bz2
sord-edcd7137e091df562f70daa1092f09d4e92f15a3.zip
Sord 0.4.2
git-svn-id: http://svn.drobilla.net/sord/trunk@146 3d64ff67-21c5-427c-a301-fe4f08042e5a
Diffstat (limited to 'wscript')
-rw-r--r--wscript20
1 files changed, 13 insertions, 7 deletions
diff --git a/wscript b/wscript
index 06ca0a5..6f7e2b4 100644
--- a/wscript
+++ b/wscript
@@ -6,7 +6,7 @@ from waflib.extras import autowaf as autowaf
import waflib.Logs as Logs, waflib.Options as Options
# Version of this package (even if built as a child)
-SORD_VERSION = '0.4.1'
+SORD_VERSION = '0.4.2'
SORD_MAJOR_VERSION = '0'
# Library version (UNIX style major, minor, micro)
@@ -60,15 +60,21 @@ def configure(conf):
autowaf.define(conf, 'SORD_VERSION', SORD_VERSION)
conf.write_config_header('sord-config.h', remove=False)
- conf.env['INCLUDES_SORD'] = ['%s/sord-%s' % (
- conf.env['INCLUDEDIR'], SORD_MAJOR_VERSION)]
-
+ def fallback(var, val):
+ conf.env[var] = val
+ Logs.warn("Warning: %s unset, using %s\n" % (var, val))
+
+ conf.env['INCLUDES_SORD'] = ['${includedir}/sord-%s' % SORD_MAJOR_VERSION]
if not conf.env['INCLUDES_SERD']:
- # Not sure why/how this happens, but assume serd is in the same prefix
- Logs.warn("Warning: INCLUDES_SERD not found in environment, odd...\n")
- conf.env['INCLUDES_SORD'] = ['%s/serd-0' % conf.env['INCLUDEDIR']]
+ fallback('INCLUDES_SERD', ['${includedir}/serd-0'])
+
conf.env['LIBPATH_SORD'] = [conf.env['LIBDIR']]
+ if not conf.env['LIBPATH_SERD']:
+ fallback('LIBPATH_SERD', conf.env['LIBPATH_SORD'])
+
conf.env['LIB_SORD'] = ['sord-%s' % SORD_MAJOR_VERSION];
+ if not conf.env['LIB_SERD']:
+ fallback('LIB_SERD', 'serd-0')
autowaf.display_msg(conf, "Utilities", bool(conf.env['BUILD_UTILS']))
autowaf.display_msg(conf, "Unit tests", bool(conf.env['BUILD_TESTS']))