dovecot-2.2: configure: Use pkg-config with clucene if available.

dovecot at dovecot.org dovecot at dovecot.org
Fri Jan 4 05:49:37 EET 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/af5265e74b9e
changeset: 15498:af5265e74b9e
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 04 05:49:33 2013 +0200
description:
configure: Use pkg-config with clucene if available.

diffstat:

 configure.ac                       |  5 +++++
 src/plugins/fts-lucene/Makefile.am |  5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 5bb879b6e3f3 -r af5265e74b9e configure.ac
--- 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
diff -r 5bb879b6e3f3 -r af5265e74b9e src/plugins/fts-lucene/Makefile.am
--- 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 \


More information about the dovecot-cvs mailing list