From: David Bremner <david@tethera.net>
Date: Wed, 5 Oct 2016 11:34:34 +0000 (-0300)
Subject: lib: optionally silence Xapian deprecation warnings
X-Git-Tag: 0.24_rc0~88
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=0abcad7c0ec2099750720d02b97aa84ce0255f91;hp=70c6ac377b29fd17d62d97d13a4c5223bf7785cb

lib: optionally silence Xapian deprecation warnings

This is not ideal, but the new API is not available in Xapian 1.2.x, and
it seems to soon to depend on Xapian >= 1.4
---

diff --git a/configure b/configure
index 2a0ce9eb..f0fc466e 100755
--- a/configure
+++ b/configure
@@ -1142,6 +1142,7 @@ COMMON_CONFIGURE_CFLAGS = \\
 	-DSTD_GETPWUID=\$(STD_GETPWUID)				\\
 	-DSTD_ASCTIME=\$(STD_ASCTIME)				\\
 	-DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)		\\
+	-DSILENCE_XAPIAN_DEPRECATION_WARNINGS			\\
 	-DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
 	-DHAVE_XAPIAN_DB_RETRY_LOCK=\$(HAVE_XAPIAN_DB_RETRY_LOCK) \\
 	-DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
diff --git a/lib/database-private.h b/lib/database-private.h
index ca71a92f..ccc1e9a1 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -32,6 +32,10 @@
 
 #include "notmuch-private.h"
 
+#ifdef SILENCE_XAPIAN_DEPRECATION_WARNINGS
+#define XAPIAN_DEPRECATED(D) D
+#endif
+
 #include <xapian.h>
 
 #pragma GCC visibility push(hidden)