Mercurial > dovecot > core-2.2

changeset 15498:af5265e74b9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: Use pkg-config with clucene if available.
author Timo Sirainen <tss@iki.fi>
date Fri, 04 Jan 2013 05:49:33 +0200
parents 5bb879b6e3f3
children 8863e68291bd
files configure.ac src/plugins/fts-lucene/Makefile.am
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Fri Jan 04 01:43:59 2013 +0200
+++ b/configure.ac	Fri Jan 04 05:49:33 2013 +0200
@@ -2660,6 +2660,11 @@
 
 have_lucene=no
 if test "$want_lucene" = "yes"; then
+  PKG_CHECK_MODULES(CLUCENE, libclucene-core,, [
+    # no pkg-config file for clucene. fallback to defaults.
+    # FIXME: we should verify here that this actually works..
+    CLUCENE_LIBS="-lclucene-shared -lclucene-core"
+  ])
   if test $want_stemmer != no; then
     AC_CHECK_LIB(stemmer, sb_stemmer_new, [
       have_lucene_stemmer=yes
--- a/src/plugins/fts-lucene/Makefile.am	Fri Jan 04 01:43:59 2013 +0200
+++ b/src/plugins/fts-lucene/Makefile.am	Fri Jan 04 05:49:33 2013 +0200
@@ -8,6 +8,9 @@
 	-I$(top_srcdir)/src/plugins/fts \
 	-I$(top_srcdir)/src/doveadm
 
+AM_CXXFLAGS = \
+	$(CLUCENE_CFLAGS)
+
 NOPLUGIN_LDFLAGS =
 lib21_fts_lucene_plugin_la_LDFLAGS = -module -avoid-version
 lib20_doveadm_fts_lucene_plugin_la_LDFLAGS = -module -avoid-version
@@ -28,7 +31,7 @@
 endif
 
 lib21_fts_lucene_plugin_la_LIBADD = \
-	-lclucene-shared -lclucene-core $(TEXTCAT_LIBS) $(STEMMER_LIBS)
+	$(CLUCENE_LIBS) $(TEXTCAT_LIBS) $(STEMMER_LIBS)
 
 lib21_fts_lucene_plugin_la_SOURCES = \
 	fts-lucene-plugin.c \