4store (1.1.4-1) 2002a_use_system_shared_libstemmer_autoconf.patch

--- a/src/libs/Makefile.in
+++ b/src/libs/Makefile.in
@@ -220,7 +220,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = stemmer double-metaphone mt19937-64
+SUBDIRS = double-metaphone mt19937-64
 all: all-recursive
 
 .SUFFIXES:
--- a/src/frontend/Makefile.in
+++ b/src/frontend/Makefile.in
@@ -67,7 +67,6 @@
 am_4s_import_OBJECTS = 4s-import.$(OBJEXT) import.$(OBJEXT)
 4s_import_OBJECTS = $(am_4s_import_OBJECTS)
 4s_import_DEPENDENCIES = ../common/lib4sintl.a \
-	../libs/stemmer/libstemmer.a \
 	../libs/double-metaphone/libdouble_metaphone.a \
 	../common/libsort.a
 am_4s_info_OBJECTS = 4s-info.$(OBJEXT) query.$(OBJEXT) \
@@ -108,7 +107,6 @@
 	group.$(OBJEXT) optimiser.$(OBJEXT) decimal.$(OBJEXT)
 4s_update_OBJECTS = $(am_4s_update_OBJECTS)
 4s_update_DEPENDENCIES = ../common/lib4sintl.a ../common/libsort.a \
-	../libs/stemmer/libstemmer.a \
 	../libs/double-metaphone/libdouble_metaphone.a \
 	../libs/mt19937-64/libmt64.a
 am_decimal_test_OBJECTS = decimal-test.$(OBJEXT) decimal.$(OBJEXT)
@@ -293,9 +291,9 @@
 4s_query_SOURCES = 4s-query.c query.c results.c query-data.c query-datatypes.c query-cache.c filter.c filter-datatypes.c order.c group.c optimiser.c decimal.c
 4s_query_LDADD = ../common/lib4sintl.a ../common/libsort.a ../libs/mt19937-64/libmt64.a @RAPTOR_LIBS@ @RASQAL_LIBS@ @MDNS_LIBS@
 4s_update_SOURCES = 4s-update.c update.c import.c ../common/gnu-options.c query.c results.c query-data.c query-datatypes.c query-cache.c filter.c filter-datatypes.c order.c group.c optimiser.c decimal.c
-4s_update_LDADD = ../common/lib4sintl.a ../common/libsort.a ../libs/stemmer/libstemmer.a ../libs/double-metaphone/libdouble_metaphone.a ../libs/mt19937-64/libmt64.a @RAPTOR_LIBS@ @RASQAL_LIBS@ @MDNS_LIBS@
+4s_update_LDADD = ../common/lib4sintl.a -lstemmer ../common/libsort.a ../libs/double-metaphone/libdouble_metaphone.a ../libs/mt19937-64/libmt64.a @RAPTOR_LIBS@ @RASQAL_LIBS@ @MDNS_LIBS@
 4s_import_SOURCES = 4s-import.c import.c
-4s_import_LDADD = ../common/lib4sintl.a ../libs/stemmer/libstemmer.a ../libs/double-metaphone/libdouble_metaphone.a ../common/libsort.a @RAPTOR_LIBS@ @MDNS_LIBS@
+4s_import_LDADD = ../common/lib4sintl.a -lstemmer ../libs/double-metaphone/libdouble_metaphone.a ../common/libsort.a @RAPTOR_LIBS@ @MDNS_LIBS@
 4s_delete_model_SOURCES = delete-model.c ../common/gnu-options.c
 4s_delete_model_LDADD = ../common/lib4sintl.a @MDNS_LIBS@
 4s_size_SOURCES = size.c ../common/gnu-options.c
--- a/src/http/Makefile.in
+++ b/src/http/Makefile.in
@@ -52,7 +52,7 @@
 am_4s_httpd_OBJECTS = httpd.$(OBJEXT) gnu-options.$(OBJEXT)
 4s_httpd_OBJECTS = $(am_4s_httpd_OBJECTS)
 4s_httpd_DEPENDENCIES = ../common/lib4sintl.a $(FRONTEND) \
-	../common/libsort.a ../libs/stemmer/libstemmer.a \
+	../common/libsort.a \
 	../libs/double-metaphone/libdouble_metaphone.a \
 	../libs/mt19937-64/libmt64.a
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -212,10 +212,10 @@
 FRONTEND = ../frontend/query-cache.o ../frontend/query-datatypes.o ../frontend/query-data.o ../frontend/query.o ../frontend/optimiser.o ../frontend/order.o ../frontend/filter.o ../frontend/filter-datatypes.o ../frontend/decimal.o ../frontend/results.o ../frontend/import.o ../frontend/update.o ../frontend/group.o
 
 # PROFILE = -pg
-AM_CFLAGS = -std=gnu99 -Wall $(PROFILE) -g -O2 -I./ -I../ -DGIT_REV=@GIT_REV@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @GLIB_CFLAGS@ @LIBXML_CFLAGS@ @GTHREAD_CFLAGS@ @MDNS_CFLAGS@ `pcre-config --cflags`
+AM_CFLAGS = -std=gnu99 -Wall $(PROFILE) -g -O2 -I./ -I../ -DGIT_REV=@GIT_REV@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @GLIB_CFLAGS@ @LIBXML_CFLAGS@ @GTHREAD_CFLAGS@ @MDNS_CFLAGS@ `pcre-config --cflags` -I/usr/include
 LIBS = $(PROFILE) @RASQAL_LIBS@ @RAPTOR_LIBS@ @GLIB_LIBS@ @LIBXML_LIBS@ @GTHREAD_LIBS@ @MDNS_LIBS@ `pcre-config --libs`
 4s_httpd_SOURCES = httpd.c ../common/gnu-options.c
-4s_httpd_LDADD = ../common/lib4sintl.a $(FRONTEND) ../common/libsort.a ../libs/stemmer/libstemmer.a ../libs/double-metaphone/libdouble_metaphone.a ../libs/mt19937-64/libmt64.a
+4s_httpd_LDADD = ../common/lib4sintl.a $(FRONTEND) ../common/libsort.a -lstemmer ../libs/double-metaphone/libdouble_metaphone.a ../libs/mt19937-64/libmt64.a
 all: all-am
 
 .SUFFIXES: