From 8960e2e99e481fc29c1c763d2c04818d158c09ae Mon Sep 17 00:00:00 2001 From: Blake Jones Date: Wed, 14 Nov 2012 18:09:58 +1600 Subject: [PATCH] [PATCH v3 03/10] gethostbyname: check for libnsl (Solaris support) --- 73/521c50a8bedcc27fab01acebc92693c4b966db | 118 ++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 73/521c50a8bedcc27fab01acebc92693c4b966db diff --git a/73/521c50a8bedcc27fab01acebc92693c4b966db b/73/521c50a8bedcc27fab01acebc92693c4b966db new file mode 100644 index 000000000..14d1ec43a --- /dev/null +++ b/73/521c50a8bedcc27fab01acebc92693c4b966db @@ -0,0 +1,118 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1B87D431FBC + for ; Tue, 13 Nov 2012 18:10:14 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id INh8C5LbKs4c for ; + Tue, 13 Nov 2012 18:10:12 -0800 (PST) +Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 5FE51431FAF + for ; Tue, 13 Nov 2012 18:10:11 -0800 (PST) +Received: from foo.net (localhost [127.0.0.1]) + by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qAE2A9Wg018901; + Tue, 13 Nov 2012 18:10:09 -0800 (PST) +Received: (from blakej@localhost) + by foo.net (8.14.5+Sun/8.14.5/Submit) id qAE2A94x018897; + Tue, 13 Nov 2012 18:10:09 -0800 (PST) +From: Blake Jones +To: notmuch@notmuchmail.org +Subject: [PATCH v3 03/10] gethostbyname: check for libnsl (Solaris support) +Date: Tue, 13 Nov 2012 18:09:58 -0800 +Message-Id: <1352859005-18631-4-git-send-email-blakej@foo.net> +X-Mailer: git-send-email 1.7.3.2 +In-Reply-To: <1352859005-18631-1-git-send-email-blakej@foo.net> +References: <1352859005-18631-1-git-send-email-blakej@foo.net> +X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 + (foo.net [127.0.0.1]); Tue, 13 Nov 2012 18:10:09 -0800 (PST) +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 14 Nov 2012 02:10:14 -0000 + +Add a check to "configure" to see whether -lnsl is needed for programs +that are using gethostbyname(). This change also adds the file +"compat/check_ghbn.c", which configure uses to perform its check. +--- + compat/check_ghbn.c | 9 +++++++++ + configure | 17 ++++++++++++++++- + 2 files changed, 25 insertions(+), 1 deletions(-) + create mode 100644 compat/check_ghbn.c + +diff --git a/compat/check_ghbn.c b/compat/check_ghbn.c +new file mode 100644 +index 0000000..4858d5c +--- /dev/null ++++ b/compat/check_ghbn.c +@@ -0,0 +1,9 @@ ++#include ++#include ++ ++int main() ++{ ++ (void) gethostbyname(NULL); ++ ++ return (0); ++} +diff --git a/configure b/configure +index d153f57..9707f11 100755 +--- a/configure ++++ b/configure +@@ -534,6 +534,17 @@ else + fi + rm -f compat/check_asctime + ++printf "Checking whether libnsl is needed for gethostbyname... " ++if ${CC} -o compat/check_ghbn "$srcdir"/compat/check_ghbn.c > /dev/null 2>&1 ++then ++ printf "No.\n" ++ libnsl_ldflags="" ++else ++ printf "Yes.\n" ++ libnsl_ldflags="-lnsl" ++fi ++rm -f compat/check_ghbn ++ + printf "int main(void){return 0;}\n" > minimal.c + + printf "Checking for rpath support... " +@@ -723,6 +734,9 @@ GMIME_LDFLAGS = ${gmime_ldflags} + TALLOC_CFLAGS = ${talloc_cflags} + TALLOC_LDFLAGS = ${talloc_ldflags} + ++# Flags needed to get gethostbyname() at link time ++LIBNSL_LDFLAGS = ${libnsl_ldflags} ++ + # Flags needed to have linker set rpath attribute + RPATH_LDFLAGS = ${rpath_ldflags} + +@@ -757,5 +771,6 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ + -DSTD_GETPWUID=\$(STD_GETPWUID) \\ + -DSTD_ASCTIME=\$(STD_ASCTIME) +-CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) ++CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) \\ ++ \$(LIBNSL_LDFLAGS) + EOF +-- +1.7.3.2 + -- 2.26.2