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 2a0ce9eb41568c017b95e3066e4c21ce2869d87d..f0fc466eead546174868fb79d753e7d1b138060b 100755 (executable)
--- 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 ca71a92f6c26893d92cc1435d0713d4cc69e5d96..ccc1e9a17fbddde4839fc754a7f781d799146469 100644 (file)
--- 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)