Debian names libtextcat as libexttextcat.

Patch by Stephan Bosch.

diff --git a/configure.in b/configure.in
index 7b95acdc58ad6f476c5e51bb0a7f5ce480577d94..ba7ec04118625e1249bf7f6368d07f6922b72ed5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2665,6 +2665,11 @@ if test "$want_lucene" = "yes"; then
       AC_CHECK_LIB(textcat, special_textcat_Init, [
        have_lucene_textcat=yes
        AC_DEFINE(HAVE_LUCENE_TEXTCAT,, Define if you want textcat support for CLucene)
+      ], [
+        AC_CHECK_LIB(exttextcat, special_textcat_Init, [
+          have_lucene_exttextcat=yes
+          AC_DEFINE(HAVE_LUCENE_EXTTEXTCAT,, Define if you want textcat (Debian version) support for CLucene)
+        ])
       ])
     ], [
       if test $want_stemmer = yes; then
@@ -2677,6 +2682,7 @@ if test "$want_lucene" = "yes"; then
 fi
 AM_CONDITIONAL(BUILD_LUCENE_STEMMER, test "$have_lucene_stemmer" = "yes")
 AM_CONDITIONAL(BUILD_LUCENE_TEXTCAT, test "$have_lucene_textcat" = "yes")
+AM_CONDITIONAL(BUILD_LUCENE_EXTTEXTCAT, test "$have_lucene_exttextcat" = "yes")
 
 if test $have_lucene = no; then
   not_fts="$not_fts lucene"

diff --git a/src/plugins/fts-lucene/Makefile.am b/src/plugins/fts-lucene/Makefile.am
index d34c925261bc7a2c0e8810823438de802ec9b853..2c21042b568fa71aa41f2ad429bb733dd7d7d6f1 100644 (file)
--- a/src/plugins/fts-lucene/Makefile.am
+++ b/src/plugins/fts-lucene/Makefile.am
@@ -21,6 +21,10 @@ SHOWBALL_SOURCES = Snowball.cc
 endif
 if BUILD_LUCENE_TEXTCAT
 TEXTCAT_LIBS = -ltextcat
+else
+if BUILD_LUCENE_EXTTEXTCAT
+TEXTCAT_LIBS = -lexttextcat
+endif
 endif
 
 lib21_fts_lucene_plugin_la_LIBADD = \

diff --git a/src/plugins/fts-lucene/lucene-wrapper.cc b/src/plugins/fts-lucene/lucene-wrapper.cc
index 469edec14b5bb7905274481e9693500fdf85a683..4521ab344b5f8fbb8729835b1e26205043472979 100644 (file)
--- a/src/plugins/fts-lucene/lucene-wrapper.cc
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc
@@ -18,6 +18,10 @@ extern "C" {
 #include <sys/stat.h>
 #ifdef HAVE_LUCENE_TEXTCAT
 #  include <libtextcat/textcat.h>
+#else
+#ifdef HAVE_LUCENE_EXTTEXTCAT
+#  include <libexttextcat/textcat.h>
+#endif
 #endif
 };
 #include <CLucene.h>