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

diff --git a/7e/f45ef49d9314dfdfeeb605a782923883a2ba1d b/7e/f45ef49d9314dfdfeeb605a782923883a2ba1d
new file mode 100644 (file)
index 0000000..e2e7668
--- /dev/null
+++ b/7e/f45ef49d9314dfdfeeb605a782923883a2ba1d
@@ -0,0 +1,88 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 C1778431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Apr 2014 15:27:19 -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 nzE3tlpS27Pt for <notmuch@notmuchmail.org>;\r
+       Thu, 17 Apr 2014 15:27:15 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224]) (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id EB525431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 17 Apr 2014 15:27:14 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.72) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1WaulG-0002me-UM; Thu, 17 Apr 2014 22:26:26 +0000\r
+Received: (nullmailer pid 27216 invoked by uid 1000); Thu, 17 Apr 2014\r
+       22:26:07 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME to\r
+       build\r
+Date: Fri, 18 Apr 2014 07:24:21 +0900\r
+Message-Id: <1397773461-27152-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <1397042643-10975-2-git-send-email-david@tethera.net>\r
+References: <1397042643-10975-2-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: Thu, 17 Apr 2014 22:27:19 -0000\r
+\r
+Apparently omitting it is not fatal, but let's be consistent with the\r
+other compat functions.\r
+---\r
+rebased against master\r
+ configure | 4 +++-\r
+ 1 file changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/configure b/configure\r
+index f447581..9bde2eb 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -829,7 +829,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
+@@ -908,6 +908,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
+                  \$(ZLIB_CFLAGS)                                       \\\r
+                  \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\\r
+                  \$(VALGRIND_CFLAGS)                                   \\\r
+@@ -920,6 +921,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
+                    \$(ZLIB_CFLAGS)                                     \\\r
+                    \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
+                    \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)             \\\r
+-- \r
+1.9.1\r
+\r