[PATCH] Place extra_cflags before CONFIGURE_CFLAGS

diff --git a/38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4 b/38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4
new file mode 100644 (file)
index 0000000..fd0df9f
--- /dev/null
+++ b/38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4
@@ -0,0 +1,73 @@
+Return-Path: <mw@barfooze.de>\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 859CA431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 15 Oct 2013 00:30:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 0WEG0tPh4mNN for <notmuch@notmuchmail.org>;\r
+       Tue, 15 Oct 2013 00:30:49 -0700 (PDT)\r
+Received: from furnace.wzff.de (furnace.wzff.de [176.9.216.40])\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 750F0431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 15 Oct 2013 00:30:49 -0700 (PDT)\r
+Received: from mw by furnace.wzff.de with local (Exim 4.80.1 (FreeBSD))\r
+       (envelope-from <mw@barfooze.de>)\r
+       id 1VVz5a-000OpI-QK; Tue, 15 Oct 2013 09:30:46 +0200\r
+From: Moritz Wilhelmy <mw+notmuch@barfooze.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS\r
+Date: Tue, 15 Oct 2013 09:30:45 +0200\r
+Message-Id: <1381822245-95400-1-git-send-email-mw+notmuch@barfooze.de>\r
+X-Mailer: git-send-email 1.7.9.4\r
+Cc: Moritz Wilhelmy <moritz+git@wzff.de>\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: Tue, 15 Oct 2013 07:30:53 -0000\r
+\r
+From: Moritz Wilhelmy <moritz+git@wzff.de>\r
+\r
+This ensures that the build will not attempt to use an existing notmuch.h when\r
+an older version of notmuch is already installed elsewhere (e.g. in /usr/local)\r
+and /usr/local/include is added to CONFIGURE_CFLAGS by one of the libraries\r
+(talloc, in my case)\r
+---\r
+ Makefile.local |    4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 0464a50..72524eb 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -39,8 +39,8 @@ GPG_FILE=$(SHA1_FILE).asc\r
+ PV_FILE=bindings/python/notmuch/version.py\r
+ \r
+ # Smash together user's values with our extra values\r
+-FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)\r
+-FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)\r
++FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)\r
++FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)\r
+ FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)\r
+ FINAL_NOTMUCH_LINKER = CC\r
+ ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)\r
+-- \r
+1.7.9.4\r
+\r