[PATCH] require xapian >= 1.2.6

[PATCH] require xapian >= 1.2.6

[David Bremner]

It seems that no-one tried to compile without Xapian compact support
since March of 2015, since that's when I introduced a syntax error in
that branch of the ifdef.

Given the choice of maintaining this underused branch of code, or
bumping the Xapian dependency to a version from 2011, it seems
reasonable to do the latter.
---

On the one hand I'm tempted to include this in a bugfix point release;
on the other hand I recognize this is mostly wounded pride, since
replacing a compiler error with a configure error telling the user to
upgrade Xapian is only a small win.

 configure       |  5 +++--
 lib/database.cc | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index cc6746c..2a0ce9e 100755
--- a/configure
+++ b/configure
@@ -394,6 +394,7 @@ EOF
 	printf "Yes.\n"
     else
 	printf "No.\n"
+	errors=$((errors + 1))
     fi
 
     rm -f _compact.o _compact.cc
@@ -683,8 +684,8 @@ EOF
     if [ $have_python -eq 0 ]; then
 	echo "  python interpreter"
     fi
-    if [ $have_xapian -eq 0 ]; then
-	echo "	Xapian library (including development files such as headers)"
+    if [ $have_xapian -eq 0 -o $have_xapian_compact -eq 0 ]; then
+	echo "	Xapian library (>= version 1.2.6, including development files such as headers)"
 	echo "	https://xapian.org/"
     fi
     if [ $have_zlib -eq 0 ]; then
diff --git a/lib/database.cc b/lib/database.cc
index 4bfae01..f0bfe56 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1143,7 +1143,6 @@ notmuch_database_close (notmuch_database_t *notmuch)
     return status;
 }
 
-#if HAVE_XAPIAN_COMPACT
 static int
 unlink_cb (const char *path,
 	   unused (const struct stat *sb),
@@ -1327,17 +1326,6 @@ notmuch_database_compact (const char *path,
 
     return ret;
 }
-#else
-notmuch_status_t
-notmuch_database_compact (unused (const char *path),
-			  unused (const char *backup_path),
-			  unused (notmuch_compact_status_cb_t status_cb),
-			  unused (void *closure))
-{
-    _notmuch_database_log (notmuch, "notmuch was compiled against a xapian version lacking compaction support.\n");
-    return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
-}
-#endif
 
 notmuch_status_t
 notmuch_database_destroy (notmuch_database_t *notmuch)
-- 
2.9.3

Re: [PATCH] require xapian >= 1.2.6

[Tomi Ollila]

On Wed, Oct 05 2016, David Bremner <david@tethera.net> wrote:

> It seems that no-one tried to compile without Xapian compact support
> since March of 2015, since that's when I introduced a syntax error in
> that branch of the ifdef.
>
> Given the choice of maintaining this underused branch of code, or
> bumping the Xapian dependency to a version from 2011, it seems
> reasonable to do the latter.
> ---

Works for me ;) +1

Re: [PATCH] require xapian >= 1.2.6

[David Bremner]

David Bremner <david@tethera.net> writes:

> It seems that no-one tried to compile without Xapian compact support
> since March of 2015, since that's when I introduced a syntax error in
> that branch of the ifdef.
>
> Given the choice of maintaining this underused branch of code, or
> bumping the Xapian dependency to a version from 2011, it seems
> reasonable to do the latter.

pushed to release and master

d