public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Ralf Wildenhues <Ralf.Wildenhues@gmx•de>
To: Jakub Narebski <jnareb@gmail•com>
Cc: Brandon Casey <casey@nrlssc•navy.mil>,
	git@vger•kernel.org, gitster@pobox•com, peff@peff•net,
	Brandon Casey <drafnel@gmail•com>,
	David Syzdek <david@syzdek•net>
Subject: [PATCH] configure: test whether -lresolv is needed
Date: Sun, 7 Jun 2009 07:40:29 +0200	[thread overview]
Message-ID: <20090607054028.GE5140@gmx.de> (raw)
In-Reply-To: <m3y6s54y8g.fsf@localhost.localdomain>

Check if -lresolv is needed for hstrerror; set NEEDS_RESOLV
accordingly, and substitute in config.mak.in.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx•de>
---

* Jakub Narebski wrote on Sat, Jun 06, 2009 at 09:29:34AM CEST:
> 
> CC-ed Ralf Wildenhues and David Syzdek (who hopefully can produce
> autoconf patch to squash with this one).

Completely untested, but also completely mechanical.  HTH.

Cheers,
Ralf

 config.mak.in |    1 +
 configure.ac  |    9 +++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/config.mak.in b/config.mak.in
index e8d96e8..dd60451 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -33,6 +33,7 @@ NO_EXPAT=@NO_EXPAT@
 NO_LIBGEN_H=@NO_LIBGEN_H@
 NEEDS_LIBICONV=@NEEDS_LIBICONV@
 NEEDS_SOCKET=@NEEDS_SOCKET@
+NEEDS_RESOLV=@NEEDS_RESOLV@
 NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
 NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
 NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
diff --git a/configure.ac b/configure.ac
index 108a97f..7937e60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,6 +467,15 @@ AC_CHECK_LIB([c], [socket],
 AC_SUBST(NEEDS_SOCKET)
 test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket"
 
+#
+# Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough.
+# Notably on Solaris hstrerror resides in libresolv and on Solaris 7
+# inet_ntop and inet_pton additionally reside there.
+AC_CHECK_LIB([resolv], [hstrerror],
+[NEEDS_RESOLV=],
+[NEEDS_RESOLV=YesPlease])
+AC_SUBST(NEEDS_RESOLV)
+test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
 
 ## Checks for header files.
 AC_MSG_NOTICE([CHECKS for header files])
-- 
1.6.3.2.199.g31f34

  parent reply	other threads:[~2009-06-07  5:41 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <7vk53vlxhz.fsf@alter.siamese.dyndns.org>
2009-06-05 23:36 ` [PATCH 0/8] enhancing builds on Solaris Brandon Casey
2009-06-05 23:36   ` [PATCH 1/8] Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall Brandon Casey
2009-06-05 23:36     ` [PATCH 2/8] Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments Brandon Casey
2009-06-05 23:36       ` [PATCH 3/8] diff-delta.c: "diff.h" is not a required include Brandon Casey
2009-06-05 23:36         ` [PATCH 4/8] On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec Brandon Casey
2009-06-05 23:36           ` [PATCH 5/8] git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris Brandon Casey
2009-06-05 23:36             ` [PATCH 6/8] Makefile: define __sun__ on SunOS Brandon Casey
2009-06-05 23:36               ` [PATCH 7/8] Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH Brandon Casey
2009-06-05 23:36                 ` [PATCH 8/8] Makefile: add section for SunOS 5.7 Brandon Casey
2009-06-08 11:43                 ` [PATCH 7/8] Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH Jeff King
2009-06-08 13:39                   ` Brandon Casey
2009-06-08 13:50                     ` Jeff King
2009-06-08 15:59                       ` Brandon Casey
2009-06-08 16:41                   ` Junio C Hamano
2009-06-08 22:11                     ` Jeff King
2009-06-08 23:39                       ` Brandon Casey
2009-06-09 16:31                         ` Brandon Casey
2009-06-06  0:47         ` [PATCH v2 3/8] diff-delta.c: "delta.h" is not a required include Brandon Casey
2009-06-06  1:21           ` Nicolas Pitre
2009-06-06  2:49             ` Brandon Casey
2009-06-06  3:10               ` Nicolas Pitre
2009-06-06  3:56                 ` Brandon Casey
2009-06-08 23:53                   ` [PATCH] git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8 Brandon Casey
2009-06-06  7:29       ` [PATCH 2/8] Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments Jakub Narebski
2009-06-07  1:02         ` Brandon Casey
2009-06-07  5:40         ` Ralf Wildenhues [this message]
2009-06-05 23:46   ` [PATCH 0/8] enhancing builds on Solaris Brandon Casey
2009-06-06  0:13   ` Junio C Hamano
2009-06-06  0:41     ` Brandon Casey
2009-06-08 11:50   ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090607054028.GE5140@gmx.de \
    --to=ralf.wildenhues@gmx$(echo .)de \
    --cc=casey@nrlssc$(echo .)navy.mil \
    --cc=david@syzdek$(echo .)net \
    --cc=drafnel@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=jnareb@gmail$(echo .)com \
    --cc=peff@peff$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox