[PATCH 2/3] configure: grab CPPFLAGS from the environment.

diff --git a/4a/38872cade10c099ba311dc404159d0d350e4c7 b/4a/38872cade10c099ba311dc404159d0d350e4c7
new file mode 100644 (file)
index 0000000..62b0251
--- /dev/null
+++ b/4a/38872cade10c099ba311dc404159d0d350e4c7
@@ -0,0 +1,92 @@
+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 E35BA431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 18:28:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 ypzvQld5+2-J for <notmuch@notmuchmail.org>;\r
+       Sat, 25 May 2013 18:28:51 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8BC19431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 18:28:38 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id r4Q1SU7g019217;\r
+       Sat, 25 May 2013 22:28:30 -0300\r
+Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1UgPl8-0004w1-7v; Sat, 25 May 2013 22:28:30 -0300\r
+Received: (nullmailer pid 17207 invoked by uid 1000);\r
+       Sun, 26 May 2013 01:28:16 -0000\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] configure: grab CPPFLAGS from the environment.\r
+Date: Sat, 25 May 2013 22:28:12 -0300\r
+Message-Id: <1369531693-16918-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1369531693-16918-1-git-send-email-david@tethera.net>\r
+References: <1369531693-16918-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\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: Sun, 26 May 2013 01:28:57 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This is needed in particular for hardening flags.\r
+---\r
+ configure |    5 +++++\r
+ 1 file changed, 5 insertions(+)\r
+\r
+diff --git a/configure b/configure\r
+index 460fcfc..3ba1ec3 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -43,6 +43,7 @@ fi\r
+ CC=${CC:-gcc}\r
+ CXX=${CXX:-g++}\r
+ CFLAGS=${CFLAGS:--O2}\r
++CPPFLAGS=${CPPFLAGS:-}\r
+ CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}\r
+ LDFLAGS=${LDFLAGS:-}\r
+ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}\r
+@@ -91,6 +92,7 @@ First, some common variables can specified via environment variables:\r
+ \r
+       CC              The C compiler to use\r
+       CFLAGS          Flags to pass to the C compiler\r
++        CPPFLAGS      Flags to pass to the C preprocessor\r
+       CXX             The C++ compiler to use\r
+       CXXFLAGS        Flags to pass to the C compiler\r
+       LDFLAGS         Flags to pass when linking\r
+@@ -615,6 +617,9 @@ EMACS = emacs --quick\r
+ # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")\r
+ CFLAGS = ${CFLAGS}\r
+ \r
++# Default FLAGS for C preprocessor (can be overridden by user such as "make CPPFLAGS=-I/usr/local/include")\r
++CPPFLAGS = ${CPPFLAGS}\r
++\r
+ # Default FLAGS for C++ compiler (can be overridden by user such as "make CXXFLAGS=-g")\r
+ CXXFLAGS = ${CXXFLAGS}\r
+ \r
+-- \r
+1.7.10.4\r
+\r