zeitgeist team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 397
committer: Siegfried-Angel Gevatter Pujals <siegfried@xxxxxxxxxxxx>
branch nick: bluebird
timestamp: Sun 2012-02-12 21:17:52 +0100
message:
  configure.ac: check for Xapian being there
modified:
  configure.ac
  extensions/fts++/Makefile.am


--
lp:zeitgeist
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird

Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
To unsubscribe from this branch go to https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription

=== modified file 'configure.ac'
--- configure.ac	2012-02-09 15:32:36 +0000
+++ configure.ac	2012-02-12 20:17:52 +0000
@@ -96,6 +96,16 @@
 	po/Makefile.in
 ])
 
+# check for Xapian
+AC_CHECK_PROG(HAVE_XAPIAN, xapian-config, yes, no)
+if test "x$HAVE_XAPIAN" = "xno"; then
+  AC_MSG_ERROR("You need the Xapian development files in order to compile Zeitgeist")
+fi
+XAPIAN_LIBS=`xapian-config --libs`
+XAPIAN_CXXFLAGS=`xapian-config --cxxflags`
+AC_SUBST(XAPIAN_LIBS)
+AC_SUBST(XAPIAN_CXXFLAGS)
+
 # check for rapper
 AC_CHECK_PROG(HAVE_RAPPER, rapper, yes, no)
 if test "x$HAVE_RAPPER" = "xno"; then

=== modified file 'extensions/fts++/Makefile.am'
--- extensions/fts++/Makefile.am	2012-02-09 15:32:36 +0000
+++ extensions/fts++/Makefile.am	2012-02-12 20:17:52 +0000
@@ -13,6 +13,7 @@
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
+	$(XAPIAN_CXXFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-w \
 	$(NULL)
@@ -73,7 +74,7 @@
 
 zeitgeist_fts_LDADD = \
 	$(builddir)/libzeitgeist-internal.la \
-	-lxapian \
+	$(XAPIAN_LIBS) \
 	$(NULL)
 
 if HAVE_DEE_ICU