changeset 586:e190b7f2ad7c

Merge branch 'sparql'

--- a/sparql/librdf/configure.ac	Mon Aug 03 09:58:42 2009 +0000
+++ b/sparql/librdf/configure.ac	Thu Aug 06 12:00:46 2009 +0000
@@ -185,6 +185,30 @@
 rdf_query="rasqal(system $RASQAL_VERSION)"
 AC_MSG_RESULT(system $RASQAL_VERSION)
 
+# Check for redland
+AC_MSG_CHECKING(for redland)
+
+REDLAND_MIN_VERSION=1.0.9
+AC_SUBST(REDLAND_MIN_VERSION)
+if $PKG_CONFIG redland --exists; then
+  :
+else
+  AC_MSG_ERROR(Redland is not installed - see http://librdf.org/ to get a version newer than $REDLAND_MIN_VERSION)
+fi
+
+REDLAND_VERSION=`$PKG_CONFIG redland --modversion 2>/dev/null`
+
+if $PKG_CONFIG redland --atleast-version=$REDLAND_MIN_VERSION; then
+  :
+else
+  AC_MSG_ERROR(Installed redland $REDLAND_VERSION is not newer than $REDLAND_MIN_VERSION)
+fi
+
+LIBRDF_EXTERNAL_CPPFLAGS="`$PKG_CONFIG redland --cflags` $LIBRDF_EXTERNAL_CPPFLAGS"
+LIBRDF_EXTERNAL_LIBS="`$PKG_CONFIG redland --libs` $LIBRDF_EXTERNAL_LIBS"
+
+AC_MSG_RESULT(system $REDLAND_VERSION)
+
 LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS"
 LDFLAGS="$LDFLAGS"

--- a/sparql/librdf/src/Makefile.am	Mon Aug 03 09:58:42 2009 +0000
+++ b/sparql/librdf/src/Makefile.am	Thu Aug 06 12:00:46 2009 +0000
@@ -25,9 +25,9 @@
 
 plugin_LTLIBRARIES = librdf_storage_audiodb.la
 librdf_storage_audiodb_la_SOURCES = rdf_storage_audiodb.c
-librdf_storage_audiodb_la_CPPFLAGS = `pkg-config redland --cflags`
+librdf_storage_audiodb_la_CPPFLAGS = 
 librdf_storage_audiodb_la_LIBADD = -laudioDB
-librdf_storage_audiodb_la_LDFLAGS = -module -avoid-version `pkg-config redland --libs`
+librdf_storage_audiodb_la_LDFLAGS = -module -avoid-version
 
 # Use tar, whatever it is called (better be GNU tar though)
 TAR=@TAR@
@@ -41,7 +41,7 @@
 
 AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
 AM_CFLAGS += -DLIBRDF_MODULE_DIR="\"$(libdir)/redland\""
-AM_LDFLAGS = -L/usr/local/lib/
+AM_LDFLAGS = @LIBRDF_INTERNAL_LIBS@ @LIBRDF_EXTERNAL_LIBS@
 
 LOCAL_LIB_DIR=lib