Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=604d205225c2751bf7ba4ff756c0ddb02b78672f
commit 604d205225c2751bf7ba4ff756c0ddb02b78672f Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Jan 26 10:18:54 2010 +0000 redland-1.0.9 *we have librdf same pkg *delete it diff --git a/source/xlib-extra/redland/FrugalBuild b/source/xlib-extra/redland/FrugalBuild deleted file mode 100644 index 9689097..0000000 --- a/source/xlib-extra/redland/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: DeX77 <d...@dragonslave.de> -# Compiling Time: 0.82 SBU - -pkgname=redland -pkgver=1.0.9 -pkgrel=1 -pkgdesc="Library that provides a high-level interface to RDF data" -url="http://librdf.org/" -license="GPL" -groups=('xlib-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump http://download.librdf.org/source/ | grep redland-[0-9] | Flasttar" -depends=('raptor' 'db' 'libpq' 'libmysqlclient' 'sqlite3'\ - 'curl' 'libxslt' 'mpfr' 'rasqal') -makedepends=('gtk-doc') -source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz - redland-1.0.9-sqlite-compile.patch - redland-1.0.9-storage-link.patch) -md5sums=('e5ef0c29c55b4f0f5aeed7955b4d383b' - 'e1a6d167640665e4b86207f55e238d4a' - '0068d0cdf990584d2e50b4b4a36b1cb5') - - -# optimization OK diff --git a/source/xlib-extra/redland/redland-1.0.9-sqlite-compile.patch b/source/xlib-extra/redland/redland-1.0.9-sqlite-compile.patch deleted file mode 100644 index b3aec3e..0000000 --- a/source/xlib-extra/redland/redland-1.0.9-sqlite-compile.patch +++ /dev/null @@ -1,377 +0,0 @@ -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 diff --git a/source/xlib-extra/redland/redland-1.0.9-storage-link.patch b/source/xlib-extra/redland/redland-1.0.9-storage-link.patch deleted file mode 100644 index 60a851e..0000000 --- a/source/xlib-extra/redland/redland-1.0.9-storage-link.patch +++ /dev/null @@ -1,127 +0,0 @@ -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 = -...@modular_librdf_true@@storage_mysql_t...@librdf_storage_mysql_la_dependencies = \ -...@modular_librdf_true@@STORAGE_MYSQL_TRUE@ librdf.la - am__librdf_storage_mysql_la_SOURCES_DIST = rdf_storage_mysql.c - @MODULAR_LIBRDF_TRUE@@storage_mysql_t...@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_t...@am_librdf_storage_mysql_la_rpath = \ - @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@ -rpath $(plugindir) --librdf_storage_postgresql_la_DEPENDENCIES = -...@modular_librdf_true@@storage_postgresql_t...@librdf_storage_postgresql_la_dependencies = \ -...@modular_librdf_true@@STORAGE_POSTGRESQL_TRUE@ librdf.la - am__librdf_storage_postgresql_la_SOURCES_DIST = \ - rdf_storage_postgresql.c - @MODULAR_LIBRDF_TRUE@@storage_postgresql_t...@am_librdf_storage_postgresql_la_objects = librdf_storage_postgresql_la-rdf_storage_postgresql.lo -@@ -164,7 +166,8 @@ - @MODULAR_LIBRDF_TRUE@@storage_postgresql_t...@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 = -...@modular_librdf_true@@storage_sqlite_t...@librdf_storage_sqlite_la_dependencies = \ -...@modular_librdf_true@@STORAGE_SQLITE_TRUE@ librdf.la - am__librdf_storage_sqlite_la_SOURCES_DIST = rdf_storage_sqlite.c - @MODULAR_LIBRDF_TRUE@@storage_sqlite_t...@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_t...@am_librdf_storage_sqlite_la_rpath = \ - @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@ -rpath $(plugindir) --librdf_storage_tstore_la_DEPENDENCIES = -...@modular_librdf_true@@storage_tstore_t...@librdf_storage_tstore_la_dependencies = \ -...@modular_librdf_true@@STORAGE_TSTORE_TRUE@ librdf.la - am__librdf_storage_tstore_la_SOURCES_DIST = rdf_storage_tstore.c - @MODULAR_LIBRDF_TRUE@@storage_tstore_t...@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_t...@librdf_storage_tstore_la_sources = rdf_storage_tstore.c - @MODULAR_LIBRDF_TRUE@@storage_tstore_t...@librdf_storage_tstore_la_cppflags = @TSTORE_CPPFLAGS@ -...@modular_librdf_true@@storage_tstore_t...@librdf_storage_tstore_la_libadd = @TSTORE_LIBS@ -...@modular_librdf_true@@storage_tstore_t...@librdf_storage_tstore_la_libadd = @TSTORE_LIBS@ librdf.la - @MODULAR_LIBRDF_TRUE@@storage_tstore_t...@librdf_storage_tstore_la_ldflags = -module -avoid-version - @MODULAR_LIBRDF_TRUE@@storage_mysql_t...@librdf_storage_mysql_la_sources = rdf_storage_mysql.c - @MODULAR_LIBRDF_TRUE@@storage_mysql_t...@librdf_storage_mysql_la_cppflags = @MYSQL_CPPFLAGS@ -...@modular_librdf_true@@storage_mysql_t...@librdf_storage_mysql_la_libadd = @MYSQL_LIBS@ -...@modular_librdf_true@@storage_mysql_t...@librdf_storage_mysql_la_libadd = @MYSQL_LIBS@ librdf.la - @MODULAR_LIBRDF_TRUE@@storage_mysql_t...@librdf_storage_mysql_la_ldflags = -module -avoid-version - @MODULAR_LIBRDF_TRUE@@storage_sqlite_t...@librdf_storage_sqlite_la_sources = rdf_storage_sqlite.c - @MODULAR_LIBRDF_TRUE@@storage_sqlite_t...@librdf_storage_sqlite_la_cppflags = @SQLITE_CPPFLAGS@ -...@modular_librdf_true@@storage_sqlite_t...@librdf_storage_sqlite_la_libadd = @SQLITE_LIBS@ -...@modular_librdf_true@@storage_sqlite_t...@librdf_storage_sqlite_la_libadd = @SQLITE_LIBS@ librdf.la - @MODULAR_LIBRDF_TRUE@@storage_sqlite_t...@librdf_storage_sqlite_la_ldflags = -module -avoid-version - @MODULAR_LIBRDF_TRUE@@storage_postgresql_t...@librdf_storage_postgresql_la_sources = rdf_storage_postgresql.c - @MODULAR_LIBRDF_TRUE@@storage_postgresql_t...@librdf_storage_postgresql_la_cppflags = @POSTGRESQL_CPPFLAGS@ -...@modular_librdf_true@@storage_postgresql_t...@librdf_storage_postgresql_la_libadd = @POSTGRESQL_LIBS@ -...@modular_librdf_true@@storage_postgresql_t...@librdf_storage_postgresql_la_libadd = @POSTGRESQL_LIBS@ librdf.la - @MODULAR_LIBRDF_TRUE@@storage_postgresql_t...@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)\"" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git