Annotation of /trunk/redland/patches/redland-1.0.9-librdf_storage_register_factory.patch
Parent Directory | Revision Log
Revision 917 -
(hide annotations)
(download)
Fri Oct 30 09:54:07 2009 UTC (14 years, 10 months ago) by niro
File size: 7323 byte(s)
Fri Oct 30 09:54:07 2009 UTC (14 years, 10 months ago) by niro
File size: 7323 byte(s)
patches
1 | niro | 917 | diff -ur redland-1.0.9.orig/src/Makefile.am redland-1.0.9/src/Makefile.am |
2 | --- redland-1.0.9.orig/src/Makefile.am 2009-04-13 04:01:30.000000000 +0300 | ||
3 | +++ redland-1.0.9/src/Makefile.am 2009-08-18 17:13:24.000000000 +0300 | ||
4 | @@ -119,7 +119,7 @@ | ||
5 | plugin_LTLIBRARIES += librdf_storage_tstore.la | ||
6 | librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c | ||
7 | librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@ | ||
8 | -librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ | ||
9 | +librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la | ||
10 | librdf_storage_tstore_la_LDFLAGS = -module -avoid-version | ||
11 | endif | ||
12 | |||
13 | @@ -127,7 +127,7 @@ | ||
14 | plugin_LTLIBRARIES += librdf_storage_mysql.la | ||
15 | librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c | ||
16 | librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@ | ||
17 | -librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ | ||
18 | +librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la | ||
19 | librdf_storage_mysql_la_LDFLAGS = -module -avoid-version | ||
20 | endif | ||
21 | |||
22 | @@ -135,7 +135,7 @@ | ||
23 | plugin_LTLIBRARIES += librdf_storage_sqlite.la | ||
24 | librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c | ||
25 | librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@ | ||
26 | -librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ | ||
27 | +librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la | ||
28 | librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version | ||
29 | endif | ||
30 | |||
31 | @@ -143,7 +143,7 @@ | ||
32 | plugin_LTLIBRARIES += librdf_storage_postgresql.la | ||
33 | librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c | ||
34 | librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ | ||
35 | -librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ | ||
36 | +librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la | ||
37 | librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version | ||
38 | endif | ||
39 | |||
40 | @@ -202,7 +202,8 @@ | ||
41 | rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \ | ||
42 | rdf_init_test rdf_cache_test | ||
43 | |||
44 | -TESTS_ENVIRONMENT=REDLAND_MODULE_PATH= | ||
45 | +# Set the place to find storage modules for testing | ||
46 | +TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=$(abs_builddir)/.libs | ||
47 | |||
48 | CLEANFILES=$(TESTS) $(local_tests) test test*.db test.rdf | ||
49 | |||
50 | diff -ur redland-1.0.9.orig/src/Makefile.in redland-1.0.9/src/Makefile.in | ||
51 | --- redland-1.0.9.orig/src/Makefile.in 2009-04-13 04:04:20.000000000 +0300 | ||
52 | +++ redland-1.0.9/src/Makefile.in 2009-08-18 17:13:24.000000000 +0300 | ||
53 | @@ -141,7 +141,8 @@ | ||
54 | librdf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
55 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | ||
56 | $(librdf_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
57 | -librdf_storage_mysql_la_DEPENDENCIES = | ||
58 | +@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_DEPENDENCIES = \ | ||
59 | +@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@ librdf.la | ||
60 | am__librdf_storage_mysql_la_SOURCES_DIST = rdf_storage_mysql.c | ||
61 | @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_OBJECTS = librdf_storage_mysql_la-rdf_storage_mysql.lo | ||
62 | librdf_storage_mysql_la_OBJECTS = \ | ||
63 | @@ -151,7 +152,8 @@ | ||
64 | $(librdf_storage_mysql_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
65 | @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_rpath = \ | ||
66 | @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@ -rpath $(plugindir) | ||
67 | -librdf_storage_postgresql_la_DEPENDENCIES = | ||
68 | +@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_DEPENDENCIES = \ | ||
69 | +@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@ librdf.la | ||
70 | am__librdf_storage_postgresql_la_SOURCES_DIST = \ | ||
71 | rdf_storage_postgresql.c | ||
72 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_OBJECTS = librdf_storage_postgresql_la-rdf_storage_postgresql.lo | ||
73 | @@ -164,7 +166,8 @@ | ||
74 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_rpath = \ | ||
75 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@ -rpath \ | ||
76 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@ $(plugindir) | ||
77 | -librdf_storage_sqlite_la_DEPENDENCIES = | ||
78 | +@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_DEPENDENCIES = \ | ||
79 | +@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@ librdf.la | ||
80 | am__librdf_storage_sqlite_la_SOURCES_DIST = rdf_storage_sqlite.c | ||
81 | @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_OBJECTS = librdf_storage_sqlite_la-rdf_storage_sqlite.lo | ||
82 | librdf_storage_sqlite_la_OBJECTS = \ | ||
83 | @@ -174,7 +177,8 @@ | ||
84 | $(librdf_storage_sqlite_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
85 | @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_rpath = \ | ||
86 | @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@ -rpath $(plugindir) | ||
87 | -librdf_storage_tstore_la_DEPENDENCIES = | ||
88 | +@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_DEPENDENCIES = \ | ||
89 | +@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@ librdf.la | ||
90 | am__librdf_storage_tstore_la_SOURCES_DIST = rdf_storage_tstore.c | ||
91 | @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@am_librdf_storage_tstore_la_OBJECTS = librdf_storage_tstore_la-rdf_storage_tstore.lo | ||
92 | librdf_storage_tstore_la_OBJECTS = \ | ||
93 | @@ -463,19 +467,19 @@ | ||
94 | @MODULAR_LIBRDF_TRUE@ $(am__append_6) | ||
95 | @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c | ||
96 | @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@ | ||
97 | -@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ | ||
98 | +@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la | ||
99 | @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LDFLAGS = -module -avoid-version | ||
100 | @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c | ||
101 | @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@ | ||
102 | -@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ | ||
103 | +@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la | ||
104 | @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LDFLAGS = -module -avoid-version | ||
105 | @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c | ||
106 | @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@ | ||
107 | -@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ | ||
108 | +@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la | ||
109 | @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version | ||
110 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c | ||
111 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ | ||
112 | -@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ | ||
113 | +@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la | ||
114 | @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version | ||
115 | librdf_la_LIBADD = \ | ||
116 | @LTLIBOBJS@ @DIGEST_OBJS@ @HASH_OBJS@ \ | ||
117 | @@ -502,7 +506,9 @@ | ||
118 | rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \ | ||
119 | rdf_init_test rdf_cache_test | ||
120 | |||
121 | -TESTS_ENVIRONMENT = REDLAND_MODULE_PATH= | ||
122 | + | ||
123 | +# Set the place to find storage modules for testing | ||
124 | +TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=$(abs_builddir)/.libs | ||
125 | CLEANFILES = $(TESTS) $(local_tests) test test*.db test.rdf | ||
126 | AM_CPPFLAGS = @LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ \ | ||
127 | @LIBRDF_EXTERNAL_CPPFLAGS@ -DPKGDATADIR="\"$(pkgdatadir)\"" |