df/88aeb039898b71d7c2cef1552e17ac33275d66

   1 Return-Path: <too@guru-group.fi>\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 arlo.cworth.org (Postfix) with ESMTP id 3FD686DE0317\r
   6  for <notmuch@notmuchmail.org>; Fri, 13 May 2016 14:30:07 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at cworth.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0.656\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.656 tagged_above=-999 required=5 tests=[AWL=-0.126,\r
  12   HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01,\r
  13  UPPERCASE_50_75=0.791] autolearn=disabled\r
  14 Received: from arlo.cworth.org ([127.0.0.1])\r
  15  by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16  with ESMTP id dQj-6Ix_SCqe for <notmuch@notmuchmail.org>;\r
  17  Fri, 13 May 2016 14:29:58 -0700 (PDT)\r
  18 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
  19  by arlo.cworth.org (Postfix) with ESMTP id B77D76DE02B2\r
  20  for <notmuch@notmuchmail.org>; Fri, 13 May 2016 14:29:57 -0700 (PDT)\r
  21 Received: by guru.guru-group.fi (Postfix, from userid 501)\r
  22  id 1E73B10008D; Sat, 14 May 2016 00:29:47 +0300 (EEST)\r
  23 From: Tomi Ollila <tomi.ollila@iki.fi>\r
  24 To: notmuch@notmuchmail.org\r
  25 Cc: tomi.ollila@iki.fi\r
  26 Subject: [PATCH] configure: combine common parts of CONFIGURE_C{,XX}FLAGS\r
  27 Date: Sat, 14 May 2016 00:29:45 +0300\r
  28 Message-Id: <1463174985-20654-1-git-send-email-tomi.ollila@iki.fi>\r
  29 X-Mailer: git-send-email 2.8.2\r
  30 X-BeenThere: notmuch@notmuchmail.org\r
  31 X-Mailman-Version: 2.1.20\r
  32 Precedence: list\r
  33 List-Id: "Use and development of the notmuch mail system."\r
  34  <notmuch.notmuchmail.org>\r
  35 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
  36  <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  37 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
  38 List-Post: <mailto:notmuch@notmuchmail.org>\r
  39 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  40 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
  41  <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  42 X-List-Received-Date: Fri, 13 May 2016 21:30:07 -0000\r
  43 \r
  44 By combining the common parts of CONFIGURE_CFLAGS and CONFIGURE_CXXFLAGS\r
  45 to a separate make variable and using that as part of their\r
  46 definitions makes setting of these easier, DRYer and less error prone\r
  47 (especially as we cannot check potential typing errors there).\r
  48 ---\r
  49 \r
  50 This patch requires (at least patches 1-4) from David's "libconfig..."\r
  51 series ( id:1463135893-7471-1-git-send-email-david@tethera.net ).\r
  52 \r
  53 I made slight reordering of the now common flags. these 4 first lines\r
  54 in added lines basically shows that all flags in removed lines are there\r
  55 (and XAPIAN_CXXFLAGS is the only thing differing in CONFIGURE_CXXFLAGS).\r
  56 \r
  57 > +     \$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS)      \\\r
  58 > +     -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS)   \\\r
  59 > +     -DHAVE_GETLINE=\$(HAVE_GETLINE)                         \\\r
  60 > +     -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
  61 \r
  62 \r
  63  configure | 47 ++++++++++++++++++-----------------------------\r
  64  1 file changed, 18 insertions(+), 29 deletions(-)\r
  65 \r
  66 diff --git a/configure b/configure\r
  67 index eb143b2..1cb71ff 100755\r
  68 --- a/configure\r
  69 +++ b/configure\r
  70 @@ -1082,35 +1082,24 @@ WITH_BASH = ${WITH_BASH}\r
  71  WITH_ZSH = ${WITH_ZSH}\r
  72  \r
  73  # Combined flags for compiling and linking against all of the above\r
  74 -CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\\r
  75 -                  -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
  76 -                  \$(ZLIB_CFLAGS)                                       \\\r
  77 -                  \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\\r
  78 -                  \$(VALGRIND_CFLAGS)                                   \\\r
  79 -                  -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)                 \\\r
  80 -                  -DHAVE_STRSEP=\$(HAVE_STRSEP)                         \\\r
  81 -                  -DHAVE_TIMEGM=\$(HAVE_TIMEGM)                         \\\r
  82 -                  -DHAVE_D_TYPE=\$(HAVE_D_TYPE)                         \\\r
  83 -                  -DSTD_GETPWUID=\$(STD_GETPWUID)                       \\\r
  84 -                  -DSTD_ASCTIME=\$(STD_ASCTIME)                         \\\r
  85 -                  -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)         \\\r
  86 -                  -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\\r
  87 -                  -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)\r
  88 -\r
  89 -CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\\r
  90 -                    -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
  91 -                    \$(ZLIB_CFLAGS)                                     \\\r
  92 -                    \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
  93 -                    \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)             \\\r
  94 -                    -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)               \\\r
  95 -                    -DHAVE_STRSEP=\$(HAVE_STRSEP)                       \\\r
  96 -                    -DHAVE_TIMEGM=\$(HAVE_TIMEGM)                       \\\r
  97 -                    -DHAVE_D_TYPE=\$(HAVE_D_TYPE)                       \\\r
  98 -                    -DSTD_GETPWUID=\$(STD_GETPWUID)                     \\\r
  99 -                    -DSTD_ASCTIME=\$(STD_ASCTIME)                       \\\r
 100 -                    -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)       \\\r
 101 -                    -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\\r
 102 -                    -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)\r
 103 +COMMON_CONFIGURE_CFLAGS = \\\r
 104 +       \$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS)      \\\r
 105 +       -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS)   \\\r
 106 +       -DHAVE_GETLINE=\$(HAVE_GETLINE)                         \\\r
 107 +       -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\\r
 108 +       -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)                   \\\r
 109 +       -DHAVE_STRSEP=\$(HAVE_STRSEP)                           \\\r
 110 +       -DHAVE_TIMEGM=\$(HAVE_TIMEGM)                           \\\r
 111 +       -DHAVE_D_TYPE=\$(HAVE_D_TYPE)                           \\\r
 112 +       -DSTD_GETPWUID=\$(STD_GETPWUID)                         \\\r
 113 +       -DSTD_ASCTIME=\$(STD_ASCTIME)                           \\\r
 114 +       -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)           \\\r
 115 +       -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\\r
 116 +       -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)\r
 117 +\r
 118 +CONFIGURE_CFLAGS = \$(COMMON_CONFIGURE_CFLAGS)\r
 119 +\r
 120 +CONFIGURE_CXXFLAGS = \$(COMMON_CONFIGURE_CFLAGS) \$(XAPIAN_CXXFLAGS)\r
 121  \r
 122  CONFIGURE_LDFLAGS =  \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)\r
 123  EOF\r
 124 -- \r
 125 2.8.2\r
 126 \r