[PATCH 2/5] configure, test: Added variables for paths to true and false.

diff --git a/94/3444253b459e00cfade95a161b60fab2609649 b/94/3444253b459e00cfade95a161b60fab2609649
new file mode 100644 (file)
index 0000000..6e83520
--- /dev/null
+++ b/94/3444253b459e00cfade95a161b60fab2609649
@@ -0,0 +1,125 @@
+Return-Path: <cceleri@cs.stanford.edu>\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 78B27431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 10:03:03 -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\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\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 c2q1g8EvzcpJ for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 10:02:57 -0700 (PDT)\r
+Received: from qmta01.westchester.pa.mail.comcast.net\r
+       (qmta01.westchester.pa.mail.comcast.net [76.96.62.16])\r
+       by olra.theworths.org (Postfix) with ESMTP id E7AB7431FDC\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 10:02:52 -0700 (PDT)\r
+Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74])\r
+       by qmta01.westchester.pa.mail.comcast.net with comcast\r
+       id yf2K1n0031c6gX851h2skW; Tue, 06 May 2014 17:02:52 +0000\r
+Received: from jane.lan ([24.11.133.78])\r
+       by omta23.westchester.pa.mail.comcast.net with comcast\r
+       id yh2W1n00e1heoKc3jh2s2U; Tue, 06 May 2014 17:02:52 +0000\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] configure,\r
+       test: Added variables for paths to true and false.\r
+Date: Tue,  6 May 2014 13:02:25 -0400\r
+Message-Id: <1399395748-44920-3-git-send-email-cceleri@cs.stanford.edu>\r
+X-Mailer: git-send-email 1.8.5.2 (Apple Git-48)\r
+In-Reply-To: <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu>\r
+References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
+       <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1399395772;\r
+       bh=BDg1hh5oBp0Gr7AwwKWBN4eGrx7bOVASqLLjD2vT5oY=;\r
+       h=Received:Received:From:To:Subject:Date:Message-Id;\r
+       b=PxkFjZBTMZ7XA/DI4R1hynHmSGgn0WHXEdEdAaMrHzxaFkPwnQNLn0kgUCz0OZPQF\r
+       8M7iRurOS1Ic79FZJ5nv5k5USXe9qZuwt1nrNjirGyhal5/hQC/bR/KTEjce8NFC4M\r
+       SnNhWjElIhMweFSKlgeflLoM1t+YKkB839CS9srjo68ICfVeq6xezF41VffkFlCYbT\r
+       p2moIYvjN5B91TShI8O1e6Sww9M9KFh6hvW4OiXpse50CKkJqQFEjwm86YfbklFfZo\r
+       ekVihV7cNBsrRhgrMYI7uCSr0dqnnPjXTpYU4UfiNFLSWeFySFhIiNOGL7XPJIJ2WY\r
+       BjshYk21U7e/Q==\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, 06 May 2014 17:03:03 -0000\r
+\r
+The path to true may not be the same on all platforms (e.g. on Mac OS X\r
+it is /usr/bin/true), so the hard-coded path of /bin/true is not\r
+portable. This is resolved by adding a step to the configure script to\r
+locate the path of true and to use the TRUE variable wherever /bin/true\r
+was needed. The same was done for false.\r
+\r
+Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>\r
+---\r
+ configure           | 6 ++++++\r
+ test/Makefile.local | 8 ++++----\r
+ 2 files changed, 10 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 9bde2eb..0bce0a3 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -50,6 +50,8 @@ CPPFLAGS=${CPPFLAGS:-}\r
+ CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}\r
+ LDFLAGS=${LDFLAGS:-}\r
+ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}\r
++TRUE=$(which true)\r
++FALSE=$(which false)\r
+ \r
+ # We don't allow the EMACS or GZIP Makefile variables inherit values\r
+ # from the environment as we do with CC and CXX above. The reason is\r
+@@ -761,6 +763,10 @@ CXX = ${CXX}\r
+ # Command to execute emacs from Makefiles\r
+ EMACS = emacs --quick\r
+ \r
++# Define the paths to true and false.\r
++TRUE = ${TRUE}\r
++FALSE = ${FALSE}\r
++\r
+ # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")\r
+ CFLAGS = ${CFLAGS}\r
+ \r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index d622eaf..e422c06 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -37,16 +37,16 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
+ \r
+ $(dir)/have-compact: Makefile.config\r
+ ifeq ($(HAVE_XAPIAN_COMPACT),1)\r
+-      ln -sf /bin/true $@\r
++      ln -sf $(TRUE) $@\r
+ else\r
+-      ln -sf /bin/false $@\r
++      ln -sf $(FALSE) $@\r
+ endif\r
+ \r
+ $(dir)/have-man: Makefile.config\r
+ ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)\r
+-      ln -sf /bin/false $@\r
++      ln -sf $(FALSE) $@\r
+ else\r
+-      ln -sf /bin/true $@\r
++      ln -sf $(TRUE) $@\r
+ endif\r
+ \r
+ .PHONY: test check\r
+-- \r
+1.8.5.2 (Apple Git-48)\r
+\r