diff -rupN redland-1.0.11.old/src/Makefile.am redland-1.0.11/src/Makefile.am --- redland-1.0.11.old/src/Makefile.am 2010-08-03 01:52:11.000000000 -0400 +++ redland-1.0.11/src/Makefile.am 2010-10-03 02:04:02.000000000 -0400 @@ -310,10 +310,10 @@ rdf_uri_test: rdf_uri.c librdf.la $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_uri.c librdf.la rdf_statement_test: rdf_statement.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la + $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la rdf_model_test: rdf_model.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_model.c librdf.la + $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_model.c librdf.la rdf_storage_test: rdf_storage.c librdf.la $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_storage.c librdf.la @@ -334,7 +334,7 @@ rdf_concepts_test: rdf_concepts.c librdf $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_concepts.c librdf.la rdf_query_test: rdf_query.c rdf_query_results.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la + $(COMPILE_LINK) -lraptor -lrasqal -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la rdf_serializer_test: rdf_serializer.c librdf.la $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_serializer.c librdf.la @@ -349,7 +349,7 @@ rdf_avltree_test: rdf_avltree.c librdf.l $(COMPILE_LINK) -DLIBRDF_DEBUG=2 -DSTANDALONE $(srcdir)/rdf_avltree.c librdf.la rdf_init_test: rdf_init.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_init.c librdf.la + $(COMPILE_LINK) -lrasqal -DSTANDALONE $(srcdir)/rdf_init.c librdf.la @SET_MAKE@ diff -rupN redland-1.0.11.old/src/Makefile.in redland-1.0.11/src/Makefile.in --- redland-1.0.11.old/src/Makefile.in 2010-09-25 01:07:21.000000000 -0400 +++ redland-1.0.11/src/Makefile.in 2010-10-03 02:04:17.000000000 -0400 @@ -1405,10 +1405,10 @@ rdf_uri_test: rdf_uri.c librdf.la $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_uri.c librdf.la rdf_statement_test: rdf_statement.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la + $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la rdf_model_test: rdf_model.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_model.c librdf.la + $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_model.c librdf.la rdf_storage_test: rdf_storage.c librdf.la $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_storage.c librdf.la @@ -1429,7 +1429,7 @@ rdf_concepts_test: rdf_concepts.c librdf $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_concepts.c librdf.la rdf_query_test: rdf_query.c rdf_query_results.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la + $(COMPILE_LINK) -lraptor -lrasqal -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la rdf_serializer_test: rdf_serializer.c librdf.la $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_serializer.c librdf.la @@ -1444,7 +1444,7 @@ rdf_avltree_test: rdf_avltree.c librdf.l $(COMPILE_LINK) -DLIBRDF_DEBUG=2 -DSTANDALONE $(srcdir)/rdf_avltree.c librdf.la rdf_init_test: rdf_init.c librdf.la - $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_init.c librdf.la + $(COMPILE_LINK) -lrasqal -DSTANDALONE $(srcdir)/rdf_init.c librdf.la @SET_MAKE@ diff -rupN redland-1.0.11.old/utils/Makefile.am redland-1.0.11/utils/Makefile.am --- redland-1.0.11.old/utils/Makefile.am 2010-08-29 22:04:01.000000000 -0400 +++ redland-1.0.11/utils/Makefile.am 2010-10-03 01:44:43.000000000 -0400 @@ -28,12 +28,13 @@ AM_LDFLAGS=@LIBRDF_LDFLAGS@ redland_db_upgrade_SOURCES = db_upgrade.c redland_virtuoso_test_SOURCES = redland-virtuoso-test.c -redland_virtuoso_test_LDADD=@LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la +redland_virtuoso_test_LDADD= -lraptor @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la rdfproc_SOURCES = rdfproc.c if GETOPT rdfproc_SOURCES += getopt.c rdfproc_getopt.h endif +rdfproc_LDADD = -lraptor mysql-utils: $(MYSQL_UTILS) diff -rupN redland-1.0.11.old/utils/Makefile.in redland-1.0.11/utils/Makefile.in --- redland-1.0.11.old/utils/Makefile.in 2010-09-25 01:07:21.000000000 -0400 +++ redland-1.0.11/utils/Makefile.in 2010-10-03 01:43:51.000000000 -0400 @@ -65,7 +65,7 @@ am__rdfproc_SOURCES_DIST = rdfproc.c get @GETOPT_TRUE@am__objects_1 = getopt.$(OBJEXT) am_rdfproc_OBJECTS = rdfproc.$(OBJEXT) $(am__objects_1) rdfproc_OBJECTS = $(am_rdfproc_OBJECTS) -rdfproc_LDADD = $(LDADD) +rdfproc_LDADD = -lraptor $(LDADD) rdfproc_DEPENDENCIES = $(top_builddir)/src/librdf.la am_redland_db_upgrade_OBJECTS = db_upgrade.$(OBJEXT) redland_db_upgrade_OBJECTS = $(am_redland_db_upgrade_OBJECTS) @@ -325,7 +325,7 @@ LDADD = $(top_builddir)/src/librdf.la AM_LDFLAGS = @LIBRDF_LDFLAGS@ redland_db_upgrade_SOURCES = db_upgrade.c redland_virtuoso_test_SOURCES = redland-virtuoso-test.c -redland_virtuoso_test_LDADD = @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la +redland_virtuoso_test_LDADD = -lraptor @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la rdfproc_SOURCES = rdfproc.c $(am__append_1) all: all-am