Re: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT

diff --git a/4a/137bd568f33d12933d306fc67ad6a8915e9d0b b/4a/137bd568f33d12933d306fc67ad6a8915e9d0b
new file mode 100644 (file)
index 0000000..a73718a
--- /dev/null
+++ b/4a/137bd568f33d12933d306fc67ad6a8915e9d0b
@@ -0,0 +1,86 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 18CFC431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 08:32:04 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id NahT4mCvb1oT for <notmuch@notmuchmail.org>;\r
+       Mon, 28 Oct 2013 08:31:55 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id A33BE431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 08:31:55 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 988581000B2;\r
+       Mon, 28 Oct 2013 17:31:44 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT\r
+In-Reply-To: <1382969359-8457-1-git-send-email-jani@nikula.org>\r
+References: <1382969359-8457-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 28 Oct 2013 17:31:44 +0200\r
+Message-ID: <m2sivls97j.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 28 Oct 2013 15:32:04 -0000\r
+\r
+On Mon, Oct 28 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Minimal change to build notmuch against xapian that doesn't have\r
+> compaction support.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>  lib/database.cc |    4 +++-\r
+>  1 files changed, 3 insertions(+), 1 deletions(-)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 06f1c0a..20e5ec2 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -944,7 +944,9 @@ DONE:\r
+>  }\r
+>  #else\r
+>  notmuch_status_t\r
+> -notmuch_database_compact_close (unused (notmuch_database_t *notmuch))\r
+> +notmuch_database_compact (unused (const char* path),\r
+> +                      unused (const char* backup_path),\r
+> +                      unused (notmuch_compact_status_cb_t status_cb))\r
+>  {\r
+>      fprintf (stderr, "notmuch was compiled against a xapian version lacking compaction support.\n");\r
+>      return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;\r
+> -- \r
+> 1.7.2.5\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r