dovecot-2.2: Debian names libtextcat as libexttextcat.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Aug 10 05:24:40 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/558e4205c429
changeset: 14789:558e4205c429
user: Timo Sirainen <tss at iki.fi>
date: Wed Jul 11 09:32:18 2012 +0200
description:
Debian names libtextcat as libexttextcat.
Patch by Stephan Bosch.
diffstat:
configure.in | 6 ++++++
src/plugins/fts-lucene/Makefile.am | 4 ++++
src/plugins/fts-lucene/lucene-wrapper.cc | 4 ++++
3 files changed, 14 insertions(+), 0 deletions(-)
diffs (51 lines):
diff -r 5b0c88c43929 -r 558e4205c429 configure.in
--- a/configure.in Sun Jul 08 10:28:38 2012 +0300
+++ b/configure.in Wed Jul 11 09:32:18 2012 +0200
@@ -2665,6 +2665,11 @@
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 @@
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 -r 5b0c88c43929 -r 558e4205c429 src/plugins/fts-lucene/Makefile.am
--- a/src/plugins/fts-lucene/Makefile.am Sun Jul 08 10:28:38 2012 +0300
+++ b/src/plugins/fts-lucene/Makefile.am Wed Jul 11 09:32:18 2012 +0200
@@ -21,6 +21,10 @@
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 -r 5b0c88c43929 -r 558e4205c429 src/plugins/fts-lucene/lucene-wrapper.cc
--- a/src/plugins/fts-lucene/lucene-wrapper.cc Sun Jul 08 10:28:38 2012 +0300
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc Wed Jul 11 09:32:18 2012 +0200
@@ -18,6 +18,10 @@
#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>
More information about the dovecot-cvs
mailing list