[sword-cvs] sword ChangeLog,1.161,1.162 Makefile.am,1.36,1.37 configure.ac,1.28,1.29

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv27914

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
	Abstracted the search interface from SWModule
	Added experimental implementation of fast
		search framework to zText using
		clucene



Index: ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/sword/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- ChangeLog	26 Aug 2003 08:35:49 -0000	1.161
+++ ChangeLog	29 Aug 2003 06:00:16 -0000	1.162
@@ -2,6 +2,12 @@
 		app specific changes
 
 
+28-Aug-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Abstracted the search interface from SWModule
+	Added experimental implementation of fast
+		search framework to zText using
+		clucene
+
 * Release 1.5.6 *
 
 26-Aug-2003	Troy A. Griffitts <scribe@crosswire.org>

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am	12 Jul 2003 21:22:41 -0000	1.36
+++ Makefile.am	29 Aug 2003 06:00:16 -0000	1.37
@@ -103,10 +103,14 @@
 testlib_SOURCES = testlib.cpp
 
 if ICU
-testlib_LDADD = -L./lib -lsword -licui18n -licuuc
-else
-testlib_LDADD = -L./lib -lsword
+iculibs = -licui18n -licuuc
+endif
+
+if USELUCENE
+lucenelibs = -lclucene
 endif
+
+testlib_LDADD = -L./lib -lsword $(iculibs) $(lucenelibs)
 
 include locales.d/Makefile.am
 include samples/Makefile.am

Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- configure.ac	12 Jul 2003 21:22:41 -0000	1.28
+++ configure.ac	29 Aug 2003 06:00:16 -0000	1.29
@@ -31,7 +31,8 @@
 AC_ARG_WITH(zlib,[  --with-zlib             allow zlib compressed modules [default=yes]],,with_zlib=yes)
 AC_ARG_WITH(icu,[  --with-icu              use ICU for unicode [default=no]],,with_icu=no)
 AC_ARG_WITH(conf,[  --with-conf             install a new sword.conf [default=yes]],,with_conf=yes)
-AC_ARG_WITH(curl,[  --with-curl             build install manager suport using libcurl [default=yes]],,with_curl=yes)
+AC_ARG_WITH(curl,[  --with-curl             build install manager support using libcurl [default=yes]],,with_curl=yes)
+AC_ARG_WITH(lucene,[  --with-lucene         include lucene support for searching [default=yes]],,with_lucene=yes)
 
 
 # ---------------------------------------------------------------------
@@ -156,6 +157,20 @@
 fi
 
 # ---------------------------------------------------------------------
+# Check for clucene for lucene searching support
+# ---------------------------------------------------------------------
+
+#FIXME: always make lucene available without checking for lib and headers
+if test x$with_lucene = xyes; then
+   echo "lucene found - lucene searching options available"
+   LUCENE_CFLAGS=""
+   LUCENE_LIBS="-lclucene"
+   CXXFLAGS="$CXXFLAGS -DUSELUCENE"
+   CFLAGS="$CFLAGS -DUSELUCENE"
+   LIBS="$LIBS $LUCENE_LIBS"
+fi
+
+# ---------------------------------------------------------------------
 # Alter global conf directory only if not /etc
 # ---------------------------------------------------------------------
 
@@ -216,6 +231,7 @@
 AC_SUBST(CC)
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
+AC_SUBST(LUCENE_LIBS)
 AC_SUBST(ICU_LIBS)
 AC_SUBST(ICU_IOLIBS)
 AC_SUBST(ICU_VER)
@@ -236,10 +252,12 @@
 # ---------------------------------------------------------------------
 AM_CONDITIONAL(MINGW, test x$target_mingw32 = xyes)
 AM_CONDITIONAL(ICU, test x$with_icu = xyes)
+AM_CONDITIONAL(USELUCENE, test x$with_lucene = xyes)
 AM_CONDITIONAL(ICUSWORD, test x$with_icu = xsword)
 AM_CONDITIONAL(ZLIB, test x$with_zlib = xyes)
 AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes)
 AM_CONDITIONAL(INSTALLMGR, test x$with_curl = xyes)
+AM_CONDITIONAL(USELUCENE, test x$with_lucene = xyes)
 AM_CONDITIONAL(CONFDEF, test x$dir_confdef = xyes)
 AM_CONDITIONAL(USE_PKGCONF, test x$use_pkgconfig = xyes)
 #AM_CONDITIONAL(DEBUG, test x$with_debug = xyes)