Patches

Troy,

I've attached two patches to this email that I've been using lately.

The Xapian fixes a bug where swomodule does not report itself as supporting
index creation when compiled against Xapian. I don't know if other  tools
check the return value of that method, but mkfastmod doesn't run without
it, exiting instead when it thinks that building an index isn't supported.

The Diatheke includes fixes the automake file for Diatheke to allow the
full library to cross-compile for Windows from Linux with autotools.
Previously the build with utilities enabled would fail during cross-compile
while looking for certain headers on Linux.

Obviously neither one of them is a pressing need, but it would be great to
get them merged in. Thanks!

--Greg

_______________________________________________
sword-devel mailing list: [email protected]
http://crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Index: src/modules/swmodule.cpp
===================================================================
--- a/src/modules/swmodule.cpp	(revision 3900)
+++ b/src/modules/swmodule.cpp	(working copy)
@@ -1181,7 +1181,7 @@
 
 
 bool SWModule::hasSearchFramework() {
-#ifdef USELUCENE
+#if defined(USELUCENE) || defined(USEXAPIAN)
 	return true;
 #else
 	return SWSearchable::hasSearchFramework();

diff --git a/utilities/diatheke/Makefile.am b/utilities/diatheke/Makefile.am
index 8ba34e5..545af2c 100644
--- a/utilities/diatheke/Makefile.am
+++ b/utilities/diatheke/Makefile.am
@@ -1,5 +1,8 @@
 AUTOMAKE_OPTIONS = 1.6
 
+if USE_INTERNAL_REGEX
+AM_CPPFLAGS = -I$(top_srcdir)/include/internal/regex
+endif
 LDADD = $(top_builddir)/lib/libsword.la
 
 bin_PROGRAMS = diatheke