1 Return-Path: <cceleri@cs.stanford.edu>
\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 78B27431FAF
\r
6 for <notmuch@notmuchmail.org>; Tue, 6 May 2014 10:03:03 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id c2q1g8EvzcpJ for <notmuch@notmuchmail.org>;
\r
17 Tue, 6 May 2014 10:02:57 -0700 (PDT)
\r
18 Received: from qmta01.westchester.pa.mail.comcast.net
\r
19 (qmta01.westchester.pa.mail.comcast.net [76.96.62.16])
\r
20 by olra.theworths.org (Postfix) with ESMTP id E7AB7431FDC
\r
21 for <notmuch@notmuchmail.org>; Tue, 6 May 2014 10:02:52 -0700 (PDT)
\r
22 Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74])
\r
23 by qmta01.westchester.pa.mail.comcast.net with comcast
\r
24 id yf2K1n0031c6gX851h2skW; Tue, 06 May 2014 17:02:52 +0000
\r
25 Received: from jane.lan ([24.11.133.78])
\r
26 by omta23.westchester.pa.mail.comcast.net with comcast
\r
27 id yh2W1n00e1heoKc3jh2s2U; Tue, 06 May 2014 17:02:52 +0000
\r
28 From: Charles Celerier <cceleri@cs.stanford.edu>
\r
29 To: notmuch@notmuchmail.org
\r
30 Subject: [PATCH 2/5] configure,
\r
31 test: Added variables for paths to true and false.
\r
32 Date: Tue, 6 May 2014 13:02:25 -0400
\r
33 Message-Id: <1399395748-44920-3-git-send-email-cceleri@cs.stanford.edu>
\r
34 X-Mailer: git-send-email 1.8.5.2 (Apple Git-48)
\r
35 In-Reply-To: <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu>
\r
36 References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>
\r
37 <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu>
\r
38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
39 s=q20140121; t=1399395772;
\r
40 bh=BDg1hh5oBp0Gr7AwwKWBN4eGrx7bOVASqLLjD2vT5oY=;
\r
41 h=Received:Received:From:To:Subject:Date:Message-Id;
\r
42 b=PxkFjZBTMZ7XA/DI4R1hynHmSGgn0WHXEdEdAaMrHzxaFkPwnQNLn0kgUCz0OZPQF
\r
43 8M7iRurOS1Ic79FZJ5nv5k5USXe9qZuwt1nrNjirGyhal5/hQC/bR/KTEjce8NFC4M
\r
44 SnNhWjElIhMweFSKlgeflLoM1t+YKkB839CS9srjo68ICfVeq6xezF41VffkFlCYbT
\r
45 p2moIYvjN5B91TShI8O1e6Sww9M9KFh6hvW4OiXpse50CKkJqQFEjwm86YfbklFfZo
\r
46 ekVihV7cNBsrRhgrMYI7uCSr0dqnnPjXTpYU4UfiNFLSWeFySFhIiNOGL7XPJIJ2WY
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Tue, 06 May 2014 17:03:03 -0000
\r
62 The path to true may not be the same on all platforms (e.g. on Mac OS X
\r
63 it is /usr/bin/true), so the hard-coded path of /bin/true is not
\r
64 portable. This is resolved by adding a step to the configure script to
\r
65 locate the path of true and to use the TRUE variable wherever /bin/true
\r
66 was needed. The same was done for false.
\r
68 Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
\r
70 configure | 6 ++++++
\r
71 test/Makefile.local | 8 ++++----
\r
72 2 files changed, 10 insertions(+), 4 deletions(-)
\r
74 diff --git a/configure b/configure
\r
75 index 9bde2eb..0bce0a3 100755
\r
78 @@ -50,6 +50,8 @@ CPPFLAGS=${CPPFLAGS:-}
\r
79 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
\r
80 LDFLAGS=${LDFLAGS:-}
\r
81 XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
\r
83 +FALSE=$(which false)
\r
85 # We don't allow the EMACS or GZIP Makefile variables inherit values
\r
86 # from the environment as we do with CC and CXX above. The reason is
\r
87 @@ -761,6 +763,10 @@ CXX = ${CXX}
\r
88 # Command to execute emacs from Makefiles
\r
89 EMACS = emacs --quick
\r
91 +# Define the paths to true and false.
\r
95 # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")
\r
98 diff --git a/test/Makefile.local b/test/Makefile.local
\r
99 index d622eaf..e422c06 100644
\r
100 --- a/test/Makefile.local
\r
101 +++ b/test/Makefile.local
\r
102 @@ -37,16 +37,16 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
\r
104 $(dir)/have-compact: Makefile.config
\r
105 ifeq ($(HAVE_XAPIAN_COMPACT),1)
\r
106 - ln -sf /bin/true $@
\r
107 + ln -sf $(TRUE) $@
\r
109 - ln -sf /bin/false $@
\r
110 + ln -sf $(FALSE) $@
\r
113 $(dir)/have-man: Makefile.config
\r
114 ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)
\r
115 - ln -sf /bin/false $@
\r
116 + ln -sf $(FALSE) $@
\r
118 - ln -sf /bin/true $@
\r
119 + ln -sf $(TRUE) $@
\r
124 1.8.5.2 (Apple Git-48)
\r