Sord 0.4.2

git-svn-id: http://svn.drobilla.net/sord/trunk@146 3d64ff67-21c5-427c-a301-fe4f08042e5a

3 files changed, 19 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 88f5eb5..77d3bb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,10 @@
-sord (UNRELEASED) unstable; urgency=low
+sord (0.4.2) unstable; urgency=low
 
-  * Fix compilation issues
-  * Fix building documentation with Python 3
+  * Fix compilation issues on some systems
+  * Fix build system Python 3 compatibility
   * Bump Serd dependency to 0.4.0
 
- -- David Robillard <d@drobilla.net>  (UNRELEASED)
+ -- David Robillard <d@drobilla.net>  Wed, 25 May 2011 19:00:00 -0400
 
 sord (0.4.0) unstable; urgency=low
 
diff --git a/sord.pc.in b/sord.pc.in
index 1839949..5ab0e72 100644
--- a/sord.pc.in
+++ b/sord.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: Sord
 Version: @SORD_VERSION@
 Description: A lightweight C library for storing RDF statements in memory.
-Libs: -L${libdir} -lsord-@SORD_MAJOR_VERSION@
-Cflags: -I@INCLUDES_SERD@ -I@INCLUDES_SORD@
+Libs: -L@LIBPATH_SERD@ -l@LIB_SERD@ -L${libdir} -lsord-@SORD_MAJOR_VERSION@
+Cflags: -I@INCLUDES_SERD@ -I${includedir}/sord-@SORD_MAJOR_VERSION@
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']))