1 Return-Path: <blakej@foo.net>
\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 1B87D431FBC
\r
6 for <notmuch@notmuchmail.org>; Tue, 13 Nov 2012 18:10:14 -0800 (PST)
\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 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id INh8C5LbKs4c for <notmuch@notmuchmail.org>;
\r
16 Tue, 13 Nov 2012 18:10:12 -0800 (PST)
\r
17 Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 5FE51431FAF
\r
21 for <notmuch@notmuchmail.org>; Tue, 13 Nov 2012 18:10:11 -0800 (PST)
\r
22 Received: from foo.net (localhost [127.0.0.1])
\r
23 by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qAE2A9Wg018901;
\r
24 Tue, 13 Nov 2012 18:10:09 -0800 (PST)
\r
25 Received: (from blakej@localhost)
\r
26 by foo.net (8.14.5+Sun/8.14.5/Submit) id qAE2A94x018897;
\r
27 Tue, 13 Nov 2012 18:10:09 -0800 (PST)
\r
28 From: Blake Jones <blakej@foo.net>
\r
29 To: notmuch@notmuchmail.org
\r
30 Subject: [PATCH v3 03/10] gethostbyname: check for libnsl (Solaris support)
\r
31 Date: Tue, 13 Nov 2012 18:09:58 -0800
\r
32 Message-Id: <1352859005-18631-4-git-send-email-blakej@foo.net>
\r
33 X-Mailer: git-send-email 1.7.3.2
\r
34 In-Reply-To: <1352859005-18631-1-git-send-email-blakej@foo.net>
\r
35 References: <1352859005-18631-1-git-send-email-blakej@foo.net>
\r
36 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2
\r
37 (foo.net [127.0.0.1]); Tue, 13 Nov 2012 18:10:09 -0800 (PST)
\r
38 X-BeenThere: notmuch@notmuchmail.org
\r
39 X-Mailman-Version: 2.1.13
\r
41 List-Id: "Use and development of the notmuch mail system."
\r
42 <notmuch.notmuchmail.org>
\r
43 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
45 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
46 List-Post: <mailto:notmuch@notmuchmail.org>
\r
47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
48 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
50 X-List-Received-Date: Wed, 14 Nov 2012 02:10:14 -0000
\r
52 Add a check to "configure" to see whether -lnsl is needed for programs
\r
53 that are using gethostbyname(). This change also adds the file
\r
54 "compat/check_ghbn.c", which configure uses to perform its check.
\r
56 compat/check_ghbn.c | 9 +++++++++
\r
57 configure | 17 ++++++++++++++++-
\r
58 2 files changed, 25 insertions(+), 1 deletions(-)
\r
59 create mode 100644 compat/check_ghbn.c
\r
61 diff --git a/compat/check_ghbn.c b/compat/check_ghbn.c
\r
62 new file mode 100644
\r
63 index 0000000..4858d5c
\r
65 +++ b/compat/check_ghbn.c
\r
72 + (void) gethostbyname(NULL);
\r
76 diff --git a/configure b/configure
\r
77 index d153f57..9707f11 100755
\r
80 @@ -534,6 +534,17 @@ else
\r
82 rm -f compat/check_asctime
\r
84 +printf "Checking whether libnsl is needed for gethostbyname... "
\r
85 +if ${CC} -o compat/check_ghbn "$srcdir"/compat/check_ghbn.c > /dev/null 2>&1
\r
91 + libnsl_ldflags="-lnsl"
\r
93 +rm -f compat/check_ghbn
\r
95 printf "int main(void){return 0;}\n" > minimal.c
\r
97 printf "Checking for rpath support... "
\r
98 @@ -723,6 +734,9 @@ GMIME_LDFLAGS = ${gmime_ldflags}
\r
99 TALLOC_CFLAGS = ${talloc_cflags}
\r
100 TALLOC_LDFLAGS = ${talloc_ldflags}
\r
102 +# Flags needed to get gethostbyname() at link time
\r
103 +LIBNSL_LDFLAGS = ${libnsl_ldflags}
\r
105 # Flags needed to have linker set rpath attribute
\r
106 RPATH_LDFLAGS = ${rpath_ldflags}
\r
108 @@ -757,5 +771,6 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\r
109 -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
\r
110 -DSTD_GETPWUID=\$(STD_GETPWUID) \\
\r
111 -DSTD_ASCTIME=\$(STD_ASCTIME)
\r
112 -CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
\r
113 +CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) \\
\r
114 + \$(LIBNSL_LDFLAGS)
\r