build: Remove @socket_ldflags@ and @nsl_ldflags@.

These are not needed on any supported platform and the corresponding
make variables are always empty.

diff --git a/Makefile.in b/Makefile.in
index 7818f435165ff979fca65d0cb2a1d226546429ab..94b6482728bd940c124f6b57ae74fbf6113fdb65 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,8 +69,6 @@ ao_ldflags := @ao_ldflags@
 readline_ldflags := @readline_ldflags@
 samplerate_ldflags := @samplerate_ldflags@
 osl_ldflags := @osl_ldflags@
-socket_ldflags := @socket_ldflags@
-nsl_ldflags := @nsl_ldflags@
 curses_ldflags := @curses_ldflags@
 core_audio_ldflags := @core_audio_ldflags@
 crypto_ldflags := @crypto_ldflags@

diff --git a/Makefile.real b/Makefile.real
index d54a80da3f2d50bcc63b937b1f933530cffca52f..1385bb9f97a166f8659a4256fdfd2abe6fed894e 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -332,14 +332,6 @@ para_recv \
 : LDFLAGS += \
        $(mp4v2_ldflags)
 
-para_server \
-para_client \
-para_audioc \
-para_audiod \
-para_recv \
-: LDFLAGS += \
-       $(socket_ldflags) $(nsl_ldflags)
-
 para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags)
 
 $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs)))

diff --git a/configure.ac b/configure.ac
index 953a9d213e5402055d1c22407daae60a292675e0..f9115fd652962881c1e7548c3cbac55e724305df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,12 +159,6 @@ case "$enable_cryptolib" in
        ;;
 esac
 AC_SUBST(crypto_ldflags)
-########################################################################### libsocket
-AC_CHECK_LIB([c], [socket],
-       [socket_ldlflags=],
-       [socket_ldflags="-lsocket"]
-)
-AC_SUBST(socket_ldflags)
 ########################################################################## iconv
 STASH_FLAGS
 LIBS=
@@ -189,12 +183,6 @@ AC_COMPILE_IFELSE([
 AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()])
 AC_MSG_RESULT($msg)
 UNSTASH_FLAGS
-########################################################################### libnsl
-AC_CHECK_LIB([c], [gethostbyname],
-       [nsl_ldflags=],
-       [nsl_ldflags="-lnsl"]
-)
-AC_SUBST(nsl_ldflags)
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[