[PATCH 2/2] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME to build

diff --git a/64/b1fe49be901ccb09bde2545c2b3da9d388ca3f b/64/b1fe49be901ccb09bde2545c2b3da9d388ca3f
new file mode 100644 (file)
index 0000000..fdcbe66
--- /dev/null
+++ b/64/b1fe49be901ccb09bde2545c2b3da9d388ca3f
@@ -0,0 +1,88 @@
+Return-Path: <bremner@tethera.net>\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 5211E431FCF\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:24:26 -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 qyGFx9zqKEEs for <notmuch@notmuchmail.org>;\r
+       Wed,  9 Apr 2014 04:24:21 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 89CFC431FC2\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:24:21 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WXqc9-0000ah-78; Wed, 09 Apr 2014 08:24:21 -0300\r
+Received: (nullmailer pid 11019 invoked by uid 1000); Wed, 09 Apr 2014\r
+       11:24:17 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME\r
+       to build\r
+Date: Wed,  9 Apr 2014 08:24:03 -0300\r
+Message-Id: <1397042643-10975-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <1397042643-10975-1-git-send-email-david@tethera.net>\r
+References: <87r4586p7m.fsf@zancas.localnet>\r
+       <1397042643-10975-1-git-send-email-david@tethera.net>\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, 09 Apr 2014 11:24:26 -0000\r
+\r
+Apparently omitting it is not fatal, but let's be consistent with the\r
+other compat functions.\r
+---\r
+ configure | 4 +++-\r
+ 1 file changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/configure b/configure\r
+index 09f4650..256c918 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -812,7 +812,7 @@ bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(sysconfdir)/bash_completion.d}\r
+ # The directory to which zsh completions files should be installed\r
+ zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix}\r
+ \r
+-# Whether the getline function is available (if not, then notmuch will\r
++# Whether the canonicalize_file_name function is available (if not, then notmuch will\r
+ # build its own version)\r
+ HAVE_CANONICALIZE_FILE_NAME = ${have_canonicalize_file_name}\r
+ \r
+@@ -887,6 +887,7 @@ WITH_ZSH = ${WITH_ZSH}\r
+ \r
+ # Combined flags for compiling and linking against all of the above\r
+ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\\r
++                 -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
+                  \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\\r
+                  \$(VALGRIND_CFLAGS)                                   \\\r
+                  -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)                 \\\r
+@@ -898,6 +899,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\\r
+                  -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)\r
+ \r
+ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\\r
++                   -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
+                    \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
+                    \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)             \\\r
+                    -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)               \\\r
+-- \r
+1.9.0\r
+\r