From 15880bd696ffb439685fae9ae39ff4d5b8e6deeb Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Sep 2013 06:54:42 +0000
Subject: [PATCH] build: ldflags conversion: libnsl.

Similar to the previous patch, this converts the ldflags needed
for nsl and gets rid of the useless check for inet_ntoa().
---
 Makefile.in  |  3 ++-
 configure.ac | 12 +++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b154c329..5c032948 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,7 @@ osl_ldflags := @osl_ldflags@
 openssl_ldflags := @openssl_ldflags@
 gcrypt_ldflags := @gcrypt_ldflags@
 socket_ldflags := @socket_ldflags@
+nsl_ldflags := @nsl_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -319,7 +320,7 @@ para_audioc \
 para_audiod \
 para_recv \
 : LDFLAGS += \
-	$(socket_ldflags)
+	$(socket_ldflags) $(nsl_ldflags)
 
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
diff --git a/configure.ac b/configure.ac
index 9ceed415..782bedea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,16 +416,10 @@ AC_CHECK_LIB([c], [socket],
 AC_SUBST(socket_ldflags)
 ########################################################################### libnsl
 AC_CHECK_LIB([c], [gethostbyname],
-	[nsl_lib=],
-	[nsl_lib="-lnsl"]
+	[nsl_ldflags=],
+	[nsl_ldflags="-lnsl"]
 )
-server_ldflags="$server_ldflags $nsl_lib"
-client_ldflags="$client_ldflags $nsl_lib"
-audioc_ldflags="$audioc_ldflags $nsl_lib"
-recv_ldflags="$recv_ldflags $nsl_lib"
-AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[
-	AC_MSG_ERROR([Fatal: Did not find inet_ntoa().])
-],[])
+AC_SUBST(nsl_ldflags)
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-- 
2.39.2