From a76720af4220993a2f8e9e0d5da8f1ec8e3bd640 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Mon, 2 Mar 2020 23:02:17 +0200
Subject: [PATCH] make OP_WILDCARD non-conditional

Since we require Xapian 1.4 anyway, there's no need to make OP_WILDCARD
conditional.
---
 configure.ac           | 2 +-
 lib/query/mu-xapian.cc | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 947177c1..5ab501a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,7 +174,7 @@ PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
 
   AS_CASE([$xapian_version],
       [1.[[4-9]].[[0-9]]*],
-        [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
+        [AC_MSG_NOTICE([xapian $xapian_version found.])],
         [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
 
   XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
diff --git a/lib/query/mu-xapian.cc b/lib/query/mu-xapian.cc
index ffb95a07..51125946 100644
--- a/lib/query/mu-xapian.cc
+++ b/lib/query/mu-xapian.cc
@@ -56,16 +56,12 @@ xapian_query_op (const Mu::Tree& tree)
 static Xapian::Query
 make_query (const Value* val, const std::string& str, bool maybe_wildcard)
 {
-#ifndef XAPIAN_HAVE_OP_WILDCARD
-	return Xapian::Query(val->prefix + str);
-#else
 	const auto vlen{str.length()};
 	if (!maybe_wildcard || vlen <= 1 || str[vlen - 1] != '*')
 		return Xapian::Query(val->prefix + str);
 	else
 		return Xapian::Query(Xapian::Query::OP_WILDCARD,
 				     val->prefix + str.substr(0, vlen - 1));
-#endif/*XAPIAN_HAVE_OP_WILDCARD*/
 }
 
 static Xapian::Query