From e90681149948825208419480d22080da0e1a6d0b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 10 Apr 2014 08:24:03 +2100 Subject: [PATCH] [PATCH 2/2] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME to build --- 64/b1fe49be901ccb09bde2545c2b3da9d388ca3f | 88 +++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 64/b1fe49be901ccb09bde2545c2b3da9d388ca3f diff --git a/64/b1fe49be901ccb09bde2545c2b3da9d388ca3f b/64/b1fe49be901ccb09bde2545c2b3da9d388ca3f new file mode 100644 index 000000000..fdcbe6647 --- /dev/null +++ b/64/b1fe49be901ccb09bde2545c2b3da9d388ca3f @@ -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 5211E431FCF + for ; Wed, 9 Apr 2014 04:24:26 -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 qyGFx9zqKEEs for ; + Wed, 9 Apr 2014 04:24:21 -0700 (PDT) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 89CFC431FC2 + for ; Wed, 9 Apr 2014 04:24:21 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1WXqc9-0000ah-78; Wed, 09 Apr 2014 08:24:21 -0300 +Received: (nullmailer pid 11019 invoked by uid 1000); Wed, 09 Apr 2014 + 11:24:17 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME + to build +Date: Wed, 9 Apr 2014 08:24:03 -0300 +Message-Id: <1397042643-10975-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.9.0 +In-Reply-To: <1397042643-10975-1-git-send-email-david@tethera.net> +References: <87r4586p7m.fsf@zancas.localnet> + <1397042643-10975-1-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: Wed, 09 Apr 2014 11:24:26 -0000 + +Apparently omitting it is not fatal, but let's be consistent with the +other compat functions. +--- + configure | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 09f4650..256c918 100755 +--- a/configure ++++ b/configure +@@ -812,7 +812,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} + +@@ -887,6 +887,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) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ +@@ -898,6 +899,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) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ +-- +1.9.0 + -- 2.26.2