64/b1fe49be901ccb09bde2545c2b3da9d388ca3f

   1 Return-Path: <bremner@tethera.net>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 5211E431FCF\r
   6         for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:24:26 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id qyGFx9zqKEEs for <notmuch@notmuchmail.org>;\r
  16         Wed,  9 Apr 2014 04:24:21 -0700 (PDT)\r
  17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
  18         (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id 89CFC431FC2\r
  21         for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:24:21 -0700 (PDT)\r
  22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
  23         (envelope-from <bremner@tethera.net>)\r
  24         id 1WXqc9-0000ah-78; Wed, 09 Apr 2014 08:24:21 -0300\r
  25 Received: (nullmailer pid 11019 invoked by uid 1000); Wed, 09 Apr 2014\r
  26         11:24:17 -0000\r
  27 From: David Bremner <david@tethera.net>\r
  28 To: notmuch@notmuchmail.org\r
  29 Subject: [PATCH 2/2] configure: fix comment, pass HAVE_CANONICALIZE_FILE_NAME\r
  30         to build\r
  31 Date: Wed,  9 Apr 2014 08:24:03 -0300\r
  32 Message-Id: <1397042643-10975-2-git-send-email-david@tethera.net>\r
  33 X-Mailer: git-send-email 1.9.0\r
  34 In-Reply-To: <1397042643-10975-1-git-send-email-david@tethera.net>\r
  35 References: <87r4586p7m.fsf@zancas.localnet>\r
  36         <1397042643-10975-1-git-send-email-david@tethera.net>\r
  37 X-BeenThere: notmuch@notmuchmail.org\r
  38 X-Mailman-Version: 2.1.13\r
  39 Precedence: list\r
  40 List-Id: "Use and development of the notmuch mail system."\r
  41         <notmuch.notmuchmail.org>\r
  42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  43         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  45 List-Post: <mailto:notmuch@notmuchmail.org>\r
  46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  48         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  49 X-List-Received-Date: Wed, 09 Apr 2014 11:24:26 -0000\r
  50 \r
  51 Apparently omitting it is not fatal, but let's be consistent with the\r
  52 other compat functions.\r
  53 ---\r
  54  configure | 4 +++-\r
  55  1 file changed, 3 insertions(+), 1 deletion(-)\r
  56 \r
  57 diff --git a/configure b/configure\r
  58 index 09f4650..256c918 100755\r
  59 --- a/configure\r
  60 +++ b/configure\r
  61 @@ -812,7 +812,7 @@ bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(sysconfdir)/bash_completion.d}\r
  62  # The directory to which zsh completions files should be installed\r
  63  zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix}\r
  64  \r
  65 -# Whether the getline function is available (if not, then notmuch will\r
  66 +# Whether the canonicalize_file_name function is available (if not, then notmuch will\r
  67  # build its own version)\r
  68  HAVE_CANONICALIZE_FILE_NAME = ${have_canonicalize_file_name}\r
  69  \r
  70 @@ -887,6 +887,7 @@ WITH_ZSH = ${WITH_ZSH}\r
  71  \r
  72  # Combined flags for compiling and linking against all of the above\r
  73  CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\\r
  74 +                  -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
  75                    \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\\r
  76                    \$(VALGRIND_CFLAGS)                                   \\\r
  77                    -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)                 \\\r
  78 @@ -898,6 +899,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\\r
  79                    -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)\r
  80  \r
  81  CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\\r
  82 +                    -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
  83                      \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
  84                      \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)             \\\r
  85                      -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)               \\\r
  86 -- \r
  87 1.9.0\r
  88 \r