From: Brandon Casey Date: Fri, 5 Jun 2009 23:36:10 +0000 (-0500) Subject: Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments X-Git-Tag: v1.6.4-rc0~66^2~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=70cf991093d4ab8854de0090aca9cf8d10ebd8f8;p=git.git Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments This library is required on Solaris when compiling with NO_IPV6 since hstrerror resides in libresolv. Additionally, Solaris 7 will need it, since inet_ntop and inet_pton reside there too. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index ba780775c..d36e92c10 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,10 @@ all:: # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, # Patrick Mauritz). # +# 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. +# # Define NO_MMAP if you want to avoid mmap. # # Define NO_PTHREADS if you do not have or do not want to use Pthreads. @@ -700,7 +704,6 @@ ifeq ($(uname_S),SunOS) SHELL_PATH = /bin/bash NO_STRCASESTR = YesPlease NO_MEMMEM = YesPlease - NO_HSTRERROR = YesPlease NO_MKDTEMP = YesPlease OLD_ICONV = UnfortunatelyYes ifeq ($(uname_R),5.8) @@ -715,6 +718,9 @@ ifeq ($(uname_S),SunOS) NO_C99_FORMAT = YesPlease NO_STRTOUMAX = YesPlease endif + ifdef NO_IPV6 + NEEDS_RESOLV = YesPlease + endif INSTALL = /usr/ucb/install TAR = gtar BASIC_CFLAGS += -D__EXTENSIONS__ @@ -956,6 +962,9 @@ endif ifdef NEEDS_NSL EXTLIBS += -lnsl endif +ifdef NEEDS_RESOLV + EXTLIBS += -lresolv +endif ifdef NO_D_TYPE_IN_DIRENT BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT endif