[arch-commits] Commit in redland/trunk (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Tue Sep 1 23:15:49 UTC 2009


    Date: Tuesday, September 1, 2009 @ 19:15:48
  Author: andyrtr
Revision: 50834

upgpkg: redland 1.0.9-1
    new version 1.0.9; add two buildfix patches, add weird libtool dep namcap wants

Added:
  redland/trunk/redland-1.0.9-sqlite-compile.patch
  redland/trunk/redland-1.0.9-storage-link.patch
Modified:
  redland/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   25 +-
 redland-1.0.9-sqlite-compile.patch |  377 +++++++++++++++++++++++++++++++++++
 redland-1.0.9-storage-link.patch   |  127 +++++++++++
 3 files changed, 521 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-01 23:07:41 UTC (rev 50833)
+++ PKGBUILD	2009-09-01 23:15:48 UTC (rev 50834)
@@ -2,20 +2,29 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=redland
-pkgver=1.0.8
-pkgrel=4
+pkgver=1.0.9
+pkgrel=1
 pkgdesc="Redland is a library that provides a high-level interface for the Resource Description Framework (RDF). It contains librdf."
 url="http://librdf.org/"
 license="GPL"
 arch=('i686' 'x86_64')
-depends=('raptor' 'db>=4.7' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 'curl' 'libxslt' 'mpfr')
-source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz)
+depends=('raptor>=1.4.19' 'db>=4.7.25.4' 'postgresql-libs>=8.3.7-2' 'libmysqlclient>=5.1.37' 'sqlite3>=3.6.17' 'curl>=7.19.6' 'libxslt>=1.1.24-2' 'mpfr>=2.4.1' 'libtool')
+source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
+	redland-1.0.9-sqlite-compile.patch
+	redland-1.0.9-storage-link.patch)
 options=(!libtool)
-md5sums=('ca66e26082cab8bb817185a116db809b')
+md5sums=('e5ef0c29c55b4f0f5aeed7955b4d383b'
+         'e1a6d167640665e4b86207f55e238d4a'
+         '0068d0cdf990584d2e50b4b4a36b1cb5')
 
 build() {
-        cd $startdir/src/$pkgname-$pkgver
-         ./configure --prefix=/usr --with-raptor=system --with-bdb-dbname=db
+        cd ${srcdir}/${pkgname}-${pkgver}
+	# fix build 
+	patch -Np1 -i ${srcdir}/redland-1.0.9-sqlite-compile.patch || return 1 #from Mandriva
+	patch -Np1 -i ${srcdir}/redland-1.0.9-storage-link.patch || return 1 #from Gentoo
+	autoreconf
+         ./configure --prefix=/usr --enable-release --disable-static \
+	             --with-raptor=system --with-sqlite=3
         make || return 1
-        make DESTDIR=$startdir/pkg install
+        make DESTDIR=$startdir/pkg install || return 1
 }

Added: redland-1.0.9-sqlite-compile.patch
===================================================================
--- redland-1.0.9-sqlite-compile.patch	                        (rev 0)
+++ redland-1.0.9-sqlite-compile.patch	2009-09-01 23:15:48 UTC (rev 50834)
@@ -0,0 +1,377 @@
+diff -r -u redland-1.0.9.orig/configure redland-1.0.9/configure
+--- redland-1.0.9.orig/configure	2009-04-12 21:04:21.000000000 -0400
++++ redland-1.0.9/configure	2009-08-31 13:38:15.000000000 -0400
+@@ -18163,7 +18163,7 @@
+   sqlite_version=`$SQLITE_CONFIG --modversion 2>/dev/null`
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define SQLITE_API $sqlite_api_version
++#define REDLAND_SQLITE_API $sqlite_api_version
+ _ACEOF
+ 
+ 
+diff -r -u redland-1.0.9.orig/configure.ac redland-1.0.9/configure.ac
+--- redland-1.0.9.orig/configure.ac	2009-04-12 21:01:30.000000000 -0400
++++ redland-1.0.9/configure.ac	2009-08-31 13:38:15.000000000 -0400
+@@ -675,7 +675,7 @@
+     SQLITE_CONFIG="$PKG_CONFIG sqlite"
+   fi
+   sqlite_version=`$SQLITE_CONFIG --modversion 2>/dev/null`
+-  AC_DEFINE_UNQUOTED(SQLITE_API, $sqlite_api_version, [SQLite API version])
++  AC_DEFINE_UNQUOTED(REDLAND_SQLITE_API, $sqlite_api_version, [SQLite API version])
+ 
+   storages_available="$storages_available sqlite($sqlite_version)"
+   sqlite_storage_available=yes
+diff -r -u redland-1.0.9.orig/src/rdf_config.h.in redland-1.0.9/src/rdf_config.h.in
+--- redland-1.0.9.orig/src/rdf_config.h.in	2009-04-12 21:04:50.000000000 -0400
++++ redland-1.0.9/src/rdf_config.h.in	2009-08-31 13:38:54.000000000 -0400
+@@ -313,7 +313,7 @@
+ #undef SIZEOF_UNSIGNED_LONG_LONG
+ 
+ /* SQLite API version */
+-#undef SQLITE_API
++#undef REDLAND_SQLITE_API
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+diff -r -u redland-1.0.9.orig/src/rdf_storage_sqlite.c redland-1.0.9/src/rdf_storage_sqlite.c
+--- redland-1.0.9.orig/src/rdf_storage_sqlite.c	2009-04-12 19:59:01.000000000 -0400
++++ redland-1.0.9/src/rdf_storage_sqlite.c	2009-08-31 13:38:24.000000000 -0400
+@@ -45,7 +45,7 @@
+ #include <rdf_storage.h>
+ 
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+ #include <sqlite3.h>
+ #define sqlite_DB sqlite3
+ #define sqlite_STATEMENT sqlite3_stmt
+@@ -57,7 +57,7 @@
+ #define sqlite_last_insert_rowid sqlite3_last_insert_rowid
+ #endif
+ 
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+ #include <sqlite.h>
+ #define sqlite_DB sqlite
+ #define sqlite_STATEMENT sqlite_vm
+@@ -68,11 +68,11 @@
+ #endif
+ 
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+   #define GET_COLUMN_VALUE_TEXT(vm, col) sqlite3_column_text(vm, col)
+   #define GET_COLUMN_VALUE_INT(vm, col) sqlite3_column_int(vm, col)
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+   #define GET_COLUMN_VALUE_TEXT(vm, col) (unsigned char*)pazValue[col]
+   #define GET_COLUMN_VALUE_INT(vm, col) atoi(pazValue[col])
+ #endif
+@@ -791,7 +791,7 @@
+   librdf_storage_sqlite_instance* context=(librdf_storage_sqlite_instance*)storage->instance;
+   int rc=SQLITE_OK;
+   char *errmsg=NULL;
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+   int mode=0;
+ #endif
+   int db_file_exists=0;
+@@ -804,13 +804,13 @@
+   if(context->is_new && db_file_exists)
+     unlink(context->name);
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+   context->db=NULL;
+   rc=sqlite3_open(context->name, &context->db);
+   if(rc != SQLITE_OK)
+     errmsg=(char*)sqlite3_errmsg(context->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+   context->db=sqlite_open(context->name, mode, &errmsg);
+   if(context->db == NULL)
+     rc=SQLITE_ERROR;
+@@ -819,7 +819,7 @@
+     librdf_log(storage->world, 0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                "SQLite database %s open failed - %s", 
+                context->name, errmsg);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     sqlite_FREE(errmsg);
+ #endif
+     librdf_storage_sqlite_close(storage);
+@@ -1279,7 +1279,7 @@
+ 
+   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+   status=sqlite3_prepare(context->db,
+                          (const char*)request,
+                          raptor_stringbuffer_length(sb),
+@@ -1288,7 +1288,7 @@
+   if(status != SQLITE_OK)
+     errmsg=(char*)sqlite3_errmsg(context->db);
+ #endif
+-#if SQLITE_API == 2  
++#if REDLAND_SQLITE_API == 2  
+   status=sqlite_compile(context->db,
+                         (const char*)request,
+                         &scontext->zTail,
+@@ -1328,7 +1328,7 @@
+                                       librdf_statement **statement,
+                                       librdf_node **context_node) {
+   int status=SQLITE_BUSY;
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+   int pN;
+   const char **pazValue;   /* Column data */
+   const char **pazColName; /* Column names and datatypes */
+@@ -1342,10 +1342,10 @@
+    * SQLITE_MISUSE.
+   */
+   do {
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_step(vm);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_step(vm, &pN, &pazValue, &pazColName);
+ #endif
+     if(status == SQLITE_BUSY) {
+@@ -1479,12 +1479,12 @@
+   if(status == SQLITE_ERROR) {
+     char *errmsg=NULL;
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_finalize(vm);
+     if(status != SQLITE_OK)
+       errmsg=(char*)sqlite3_errmsg(scontext->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_finalize(vm, &errmsg);
+ #endif
+     if(status != SQLITE_OK) {
+@@ -1492,7 +1492,7 @@
+                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                  "SQLite database %s finalize failed - %s (%d)", 
+                  scontext->name, errmsg, status);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+       sqlite_FREE(errmsg);
+ #endif
+     }
+@@ -1583,12 +1583,12 @@
+     char *errmsg=NULL;
+     int status;
+     
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_finalize(scontext->vm);
+     if(status != SQLITE_OK)
+       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_finalize(scontext->vm, &errmsg);
+ #endif
+     if(status != SQLITE_OK) {
+@@ -1596,7 +1596,7 @@
+                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                  "SQLite database %s finalize failed - %s (%d)", 
+                  scontext->sqlite_context->name, errmsg, status);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+       sqlite_FREE(errmsg);
+ #endif
+     }
+@@ -1734,7 +1734,7 @@
+ 
+   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+   status=sqlite3_prepare(context->db,
+                          (const char*)request,
+                          raptor_stringbuffer_length(sb),
+@@ -1743,7 +1743,7 @@
+   if(status != SQLITE_OK)
+     errmsg=(char*)sqlite3_errmsg(context->db);
+ #endif
+-#if SQLITE_API == 2  
++#if REDLAND_SQLITE_API == 2  
+   status=sqlite_compile(context->db,
+                         (const char*)request,
+                         &scontext->zTail, 
+@@ -1856,12 +1856,12 @@
+     char *errmsg=NULL;
+     int status;
+     
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_finalize(scontext->vm);
+     if(status != SQLITE_OK)
+       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_finalize(scontext->vm, &errmsg);
+ #endif
+     if(status != SQLITE_OK) {
+@@ -1869,7 +1869,7 @@
+                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                  "SQLite database %s finalize failed - %s (%d)", 
+                  scontext->sqlite_context->name, errmsg, status);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+       sqlite_FREE(errmsg);
+ #endif
+     }
+@@ -2180,7 +2180,7 @@
+ 
+   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+   status=sqlite3_prepare(context->db,
+                          (const char*)request,
+                          raptor_stringbuffer_length(sb),
+@@ -2189,7 +2189,7 @@
+   if(status != SQLITE_OK)
+     errmsg=(char*)sqlite3_errmsg(context->db);
+ #endif
+-#if SQLITE_API == 2  
++#if REDLAND_SQLITE_API == 2  
+   status=sqlite_compile(context->db,
+                         (const char*)request,
+                         &scontext->zTail,
+@@ -2303,12 +2303,12 @@
+     char *errmsg=NULL;
+     int status;
+     
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_finalize(scontext->vm);
+     if(status != SQLITE_OK)
+       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_finalize(scontext->vm, &errmsg);
+ #endif
+     if(status != SQLITE_OK) {
+@@ -2316,7 +2316,7 @@
+                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                  "SQLite database %s finalize failed - %s (%d)", 
+                  scontext->sqlite_context->name, errmsg, status);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+       sqlite_FREE(errmsg);
+ #endif
+     }
+@@ -2360,7 +2360,7 @@
+                                               sqlite_STATEMENT *vm,
+                                               librdf_node **context_node) {
+   int status=SQLITE_BUSY;
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+   int pN;
+   const char **pazValue;   /* Column data */
+   const char **pazColName; /* Column names and datatypes */
+@@ -2374,10 +2374,10 @@
+    * SQLITE_MISUSE.
+   */
+   do {
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_step(vm);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_step(vm, &pN, &pazValue, &pazColName);
+ #endif
+     if(status == SQLITE_BUSY) {
+@@ -2429,12 +2429,12 @@
+   if(status == SQLITE_ERROR) {
+     char *errmsg=NULL;
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_finalize(vm);
+     if(status != SQLITE_OK)
+       errmsg=(char*)sqlite3_errmsg(scontext->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_finalize(vm, &errmsg);
+ #endif
+     if(status != SQLITE_OK) {
+@@ -2442,7 +2442,7 @@
+                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                  "SQLite database %s finalize failed - %s (%d)", 
+                  scontext->name, errmsg, status);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+       sqlite_FREE(errmsg);
+ #endif
+     }
+@@ -2541,12 +2541,12 @@
+     char *errmsg=NULL;
+     int status;
+     
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+     status=sqlite3_finalize(icontext->vm);
+     if(status != SQLITE_OK)
+       errmsg=(char*)sqlite3_errmsg(icontext->sqlite_context->db);
+ #endif
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+     status=sqlite_finalize(icontext->vm, &errmsg);
+ #endif
+     if(status != SQLITE_OK) {
+@@ -2554,7 +2554,7 @@
+                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
+                  "SQLite database %s finalize failed - %s (%d)", 
+                  icontext->sqlite_context->name, errmsg, status);
+-#if SQLITE_API == 2
++#if REDLAND_SQLITE_API == 2
+       sqlite_FREE(errmsg);
+ #endif
+     }
+@@ -2619,7 +2619,7 @@
+ 
+   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
+ 
+-#if SQLITE_API == 3
++#if REDLAND_SQLITE_API == 3
+   status=sqlite3_prepare(context->db,
+                          (const char*)request,
+                          raptor_stringbuffer_length(sb),
+@@ -2628,7 +2628,7 @@
+   if(status != SQLITE_OK)
+     errmsg=(char*)sqlite3_errmsg(context->db);
+ #endif
+-#if SQLITE_API == 2  
++#if REDLAND_SQLITE_API == 2  
+   status=sqlite_compile(context->db,
+                         (const char*)request,
+                         &icontext->zTail,
+diff -r -u redland-1.0.9.orig/src/win32_rdf_config.h redland-1.0.9/src/win32_rdf_config.h
+--- redland-1.0.9.orig/src/win32_rdf_config.h	2009-04-08 00:31:14.000000000 -0400
++++ redland-1.0.9/src/win32_rdf_config.h	2009-08-31 13:38:22.000000000 -0400
+@@ -249,7 +249,7 @@
+ #define SIZEOF_UNSIGNED_LONG_LONG 8
+ 
+ /* SQLite API version */
+-#define SQLITE_API 3
++#define REDLAND_SQLITE_API 3
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+ #define STDC_HEADERS 1

Added: redland-1.0.9-storage-link.patch
===================================================================
--- redland-1.0.9-storage-link.patch	                        (rev 0)
+++ redland-1.0.9-storage-link.patch	2009-09-01 23:15:48 UTC (rev 50834)
@@ -0,0 +1,127 @@
+diff -ur redland-1.0.9.orig/src/Makefile.am redland-1.0.9/src/Makefile.am
+--- redland-1.0.9.orig/src/Makefile.am	2009-04-13 04:01:30.000000000 +0300
++++ redland-1.0.9/src/Makefile.am	2009-08-18 17:13:24.000000000 +0300
+@@ -119,7 +119,7 @@
+ plugin_LTLIBRARIES += librdf_storage_tstore.la
+ librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
+ librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
+-librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
++librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
+ librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
+ endif
+ 
+@@ -127,7 +127,7 @@
+ plugin_LTLIBRARIES += librdf_storage_mysql.la
+ librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
+ librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
+-librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
++librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
+ librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
+ endif
+ 
+@@ -135,7 +135,7 @@
+ plugin_LTLIBRARIES += librdf_storage_sqlite.la
+ librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
+ librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
+-librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
++librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
+ librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
+ endif
+ 
+@@ -143,7 +143,7 @@
+ plugin_LTLIBRARIES += librdf_storage_postgresql.la
+ librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
+ librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+-librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
++librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
+ librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
+ endif
+ 
+@@ -202,7 +202,8 @@
+ rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
+ rdf_init_test rdf_cache_test
+ 
+-TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=
++# Set the place to find storage modules for testing
++TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=$(abs_builddir)/.libs
+ 
+ CLEANFILES=$(TESTS) $(local_tests) test test*.db test.rdf
+ 
+diff -ur redland-1.0.9.orig/src/Makefile.in redland-1.0.9/src/Makefile.in
+--- redland-1.0.9.orig/src/Makefile.in	2009-04-13 04:04:20.000000000 +0300
++++ redland-1.0.9/src/Makefile.in	2009-08-18 17:13:24.000000000 +0300
+@@ -141,7 +141,8 @@
+ librdf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(librdf_la_LDFLAGS) $(LDFLAGS) -o $@
+-librdf_storage_mysql_la_DEPENDENCIES =
++ at MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at librdf_storage_mysql_la_DEPENDENCIES =  \
++ at MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@	librdf.la
+ am__librdf_storage_mysql_la_SOURCES_DIST = rdf_storage_mysql.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at am_librdf_storage_mysql_la_OBJECTS = librdf_storage_mysql_la-rdf_storage_mysql.lo
+ librdf_storage_mysql_la_OBJECTS =  \
+@@ -151,7 +152,8 @@
+ 	$(librdf_storage_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at am_librdf_storage_mysql_la_rpath =  \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@	-rpath $(plugindir)
+-librdf_storage_postgresql_la_DEPENDENCIES =
++ at MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at librdf_storage_postgresql_la_DEPENDENCIES =  \
++ at MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@	librdf.la
+ am__librdf_storage_postgresql_la_SOURCES_DIST =  \
+ 	rdf_storage_postgresql.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at am_librdf_storage_postgresql_la_OBJECTS = librdf_storage_postgresql_la-rdf_storage_postgresql.lo
+@@ -164,7 +166,8 @@
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at am_librdf_storage_postgresql_la_rpath =  \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@	-rpath \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@	$(plugindir)
+-librdf_storage_sqlite_la_DEPENDENCIES =
++ at MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at librdf_storage_sqlite_la_DEPENDENCIES =  \
++ at MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@	librdf.la
+ am__librdf_storage_sqlite_la_SOURCES_DIST = rdf_storage_sqlite.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at am_librdf_storage_sqlite_la_OBJECTS = librdf_storage_sqlite_la-rdf_storage_sqlite.lo
+ librdf_storage_sqlite_la_OBJECTS =  \
+@@ -174,7 +177,8 @@
+ 	$(librdf_storage_sqlite_la_LDFLAGS) $(LDFLAGS) -o $@
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at am_librdf_storage_sqlite_la_rpath =  \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@	-rpath $(plugindir)
+-librdf_storage_tstore_la_DEPENDENCIES =
++ at MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at librdf_storage_tstore_la_DEPENDENCIES =  \
++ at MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@	librdf.la
+ am__librdf_storage_tstore_la_SOURCES_DIST = rdf_storage_tstore.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at am_librdf_storage_tstore_la_OBJECTS = librdf_storage_tstore_la-rdf_storage_tstore.lo
+ librdf_storage_tstore_la_OBJECTS =  \
+@@ -463,19 +467,19 @@
+ @MODULAR_LIBRDF_TRUE@	$(am__append_6)
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
+- at MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
++ at MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE at librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
+- at MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
++ at MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE at librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
+- at MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
++ at MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE at librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+- at MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
++ at MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE at librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
+ librdf_la_LIBADD = \
+ @LTLIBOBJS@ @DIGEST_OBJS@ @HASH_OBJS@ \
+@@ -502,7 +506,9 @@
+ rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
+ rdf_init_test rdf_cache_test
+ 
+-TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=
++
++# Set the place to find storage modules for testing
++TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=$(abs_builddir)/.libs
+ CLEANFILES = $(TESTS) $(local_tests) test test*.db test.rdf
+ AM_CPPFLAGS = @LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ \
+ 	@LIBRDF_EXTERNAL_CPPFLAGS@ -DPKGDATADIR="\"$(pkgdatadir)\""




More information about the arch-commits mailing list