From 4ea99525e0a1adacd39d6054d6857649964f1d19 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 18 Apr 2014 07:24:21 +0900 Subject: [PATCH] [PATCH] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME to build --- 7e/f45ef49d9314dfdfeeb605a782923883a2ba1d | 88 +++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 7e/f45ef49d9314dfdfeeb605a782923883a2ba1d diff --git a/7e/f45ef49d9314dfdfeeb605a782923883a2ba1d b/7e/f45ef49d9314dfdfeeb605a782923883a2ba1d new file mode 100644 index 000000000..e2e766804 --- /dev/null +++ b/7e/f45ef49d9314dfdfeeb605a782923883a2ba1d @@ -0,0 +1,88 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C1778431FAF + for ; Thu, 17 Apr 2014 15:27:19 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id nzE3tlpS27Pt for ; + Thu, 17 Apr 2014 15:27:15 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id EB525431FAE + for ; Thu, 17 Apr 2014 15:27:14 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.72) (envelope-from ) + id 1WaulG-0002me-UM; Thu, 17 Apr 2014 22:26:26 +0000 +Received: (nullmailer pid 27216 invoked by uid 1000); Thu, 17 Apr 2014 + 22:26:07 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME to + build +Date: Fri, 18 Apr 2014 07:24:21 +0900 +Message-Id: <1397773461-27152-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.9.1 +In-Reply-To: <1397042643-10975-2-git-send-email-david@tethera.net> +References: <1397042643-10975-2-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 17 Apr 2014 22:27:19 -0000 + +Apparently omitting it is not fatal, but let's be consistent with the +other compat functions. +--- +rebased against master + configure | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index f447581..9bde2eb 100755 +--- a/configure ++++ b/configure +@@ -829,7 +829,7 @@ bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(sysconfdir)/bash_completion.d} + # The directory to which zsh completions files should be installed + zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix} + +-# Whether the getline function is available (if not, then notmuch will ++# Whether the canonicalize_file_name function is available (if not, then notmuch will + # build its own version) + HAVE_CANONICALIZE_FILE_NAME = ${have_canonicalize_file_name} + +@@ -908,6 +908,7 @@ WITH_ZSH = ${WITH_ZSH} + + # Combined flags for compiling and linking against all of the above + CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ ++ -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\ + \$(ZLIB_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \\ +@@ -920,6 +921,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER) + + CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ ++ -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\ + \$(ZLIB_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ +-- +1.9.1 + -- 2.26.2