[PATCH 2/3] lib: Replace NOTMUCH_*_VERSION with LIBNOTMUCH_*_VERSION

diff --git a/07/a3d7473ef192fa9890b11ed0571250b13d3093 b/07/a3d7473ef192fa9890b11ed0571250b13d3093
new file mode 100644 (file)
index 0000000..d8910b2
--- /dev/null
+++ b/07/a3d7473ef192fa9890b11ed0571250b13d3093
@@ -0,0 +1,132 @@
+Return-Path: <amdragon@mit.edu>\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 C702B431FD8\r
+       for <notmuch@notmuchmail.org>; Wed,  4 Dec 2013 08:20:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 W-KwqnHlA99z for <notmuch@notmuchmail.org>;\r
+       Wed,  4 Dec 2013 08:19:58 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
+       [18.7.68.37])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6A245431FC4\r
+       for <notmuch@notmuchmail.org>; Wed,  4 Dec 2013 08:19:58 -0800 (PST)\r
+X-AuditID: 12074425-b7fd96d000000c39-54-529f562d7d55\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id EE.89.03129.D265F925; Wed,  4 Dec 2013 11:19:57 -0500 (EST)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id rB4GJsub019852; \r
+       Wed, 4 Dec 2013 11:19:55 -0500\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rB4GJqlV001681\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Wed, 4 Dec 2013 11:19:53 -0500\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VoFB2-0002Vy-Jh; Wed, 04 Dec 2013 11:19:52 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] lib: Replace NOTMUCH_*_VERSION with LIBNOTMUCH_*_VERSION\r
+Date: Wed,  4 Dec 2013 11:19:45 -0500\r
+Message-Id: <1386173986-9624-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu>\r
+References: <1386173986-9624-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsUixCmqrasbNj/IoOOEpMWN1m5Gi6bpzhbX\r
+       b85kdmD2uHX/NbvHs1W3mD22HHrPHMAcxWWTkpqTWZZapG+XwJUx/fxqloInAhXrpt5ib2A8\r
+       wNvFyMkhIWAi8fLxY3YIW0ziwr31bCC2kMBsJon3H2q6GLmA7A2MEhtvHmeBcG4zSZzvfc0O\r
+       4cxllPi7+gwTSAubgIbEtv3LGUFsEQFpiZ13Z7OC2MwCXhLLLvSD2cICvhJrT69gBrFZBFQl\r
+       2g6dBVvNK2AvMfnQLagzlCQWntoGVs8p4CDx7elRVoiT7CU2vOhhncDIv4CRYRWjbEpulW5u\r
+       YmZOcWqybnFyYl5eapGuhV5uZoleakrpJkZQcLG7qO5gnHBI6RCjAAejEg+vYvq8ICHWxLLi\r
+       ytxDjJIcTEqivILB84OE+JLyUyozEosz4otKc1KLDzFKcDArifBODgTK8aYkVlalFuXDpKQ5\r
+       WJTEeW9x2AcJCaQnlqRmp6YWpBbBZGU4OJQkeG1DgRoFi1LTUyvSMnNKENJMHJwgw3mAhsuC\r
+       1PAWFyTmFmemQ+RPMSpKifMeDgFKCIAkMkrz4Hph0f+KURzoFWHeDJB2HmDigOt+BTSYCWhw\r
+       84N5IINLEhFSUg2M7io2QW9vT09b9KqduZTda88qjyf8R858T9DydI63fbRbk/Xqv60rc0JF\r
+       33farZ8r7LjAq4Sr49KuiM+MCrardydxK9nOPPxke9tUbzGNrs8rvyX6vznSLXcxZ3pNw4tp\r
+       iStd3cJeBBqWvbbMa7g1b++thsiHLMdE+6KPZlllTuy1sv3myRWhxFKckWioxVxUnAgAFOU1\r
+       Q9kCAAA=\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: Wed, 04 Dec 2013 16:20:05 -0000\r
+\r
+This makes it clear that these macros refer to the *library* version,\r
+and not to the notmuch application-level release.  Since there are no\r
+consumers of these macros yet, this is now or never.\r
+---\r
+ lib/notmuch.h | 22 +++++++++++-----------\r
+ 1 file changed, 11 insertions(+), 11 deletions(-)\r
+\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index 42188a8..cb108ef 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -45,9 +45,9 @@ NOTMUCH_BEGIN_DECLS\r
+  * The library version number.  This must agree with the soname\r
+  * version in Makefile.local.\r
+  */\r
+-#define NOTMUCH_MAJOR_VERSION 3\r
+-#define NOTMUCH_MINOR_VERSION 0\r
+-#define NOTMUCH_MICRO_VERSION 0\r
++#define LIBNOTMUCH_MAJOR_VERSION      3\r
++#define LIBNOTMUCH_MINOR_VERSION      0\r
++#define LIBNOTMUCH_MICRO_VERSION      0\r
+ \r
+ /*\r
+  * Check the version of the notmuch library being compiled against.\r
+@@ -55,19 +55,19 @@ NOTMUCH_BEGIN_DECLS\r
+  * Return true if the library being compiled against is of the\r
+  * specified version or above. For example:\r
+  *\r
+- * #if NOTMUCH_CHECK_VERSION(0, 18, 0)\r
+- *     (code requiring notmuch 0.18 or above)\r
++ * #if LIBNOTMUCH_CHECK_VERSION(3, 0, 0)\r
++ *     (code requiring libnotmuch 3.0.0 or above)\r
+  * #endif\r
+  *\r
+- * NOTMUCH_CHECK_VERSION has been defined since version 0.17.0; you\r
++ * LIBNOTMUCH_CHECK_VERSION has been defined since version 3.0.0; you\r
+  * can use #if !defined(NOTMUCH_CHECK_VERSION) to check for versions\r
+  * prior to that.\r
+  */\r
+-#define NOTMUCH_CHECK_VERSION (major, minor, micro)                   \\r
+-    (NOTMUCH_MAJOR_VERSION > (major) ||                                       \\r
+-     (NOTMUCH_MAJOR_VERSION == (major) && NOTMUCH_MINOR_VERSION > (minor)) || \\r
+-     (NOTMUCH_MAJOR_VERSION == (major) && NOTMUCH_MINOR_VERSION == (minor) && \\r
+-      NOTMUCH_MICRO_VERSION >= (micro)))\r
++#define LIBNOTMUCH_CHECK_VERSION (major, minor, micro)                        \\r
++    (LIBNOTMUCH_MAJOR_VERSION > (major) ||                                    \\r
++     (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \\r
++     (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION == (minor) && \\r
++      LIBNOTMUCH_MICRO_VERSION >= (micro)))\r
+ \r
+ typedef int notmuch_bool_t;\r
+ \r
+-- \r
+1.8.4.rc3\r
+\r