Quick fix to build ardour against latest redland suite (1.0.13) - Ray Rashif diff -baur ardour-2.8.11.orig/SConstruct ardour-2.8.11/SConstruct --- ardour-2.8.11.orig/SConstruct 2011-07-10 02:34:07.366391894 +0800 +++ ardour-2.8.11/SConstruct 2011-07-10 02:34:13.576358252 +0800 @@ -449,6 +449,16 @@ return ret def CheckPKGVersion(context, name, version): + # check if raptor1 or raptor2 + if name == 'raptor': + context.Message( 'Checking for raptor2...' ) + ret = context.TryAction('pkg-config --exists raptor2')[0] + context.Result( ret ) + if ret: + global raptorIs2 + raptorIs2 = 1 + return ret + context.Message( 'Checking for %s... ' % name ) ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0] context.Result( ret ) @@ -565,7 +575,10 @@ libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') libraries['raptor'] = LibraryInfo() -libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') +if raptorIs2: + libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2') +else: + libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['sndfile'] = LibraryInfo() libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')