From 6623b6c0796d7c02459da996eefca8a7a084ce0e Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 18 Jul 2016 21:51:10 +0200 Subject: [PATCH] build: Remove @socket_ldflags@ and @nsl_ldflags@. These are not needed on any supported platform and the corresponding make variables are always empty. --- Makefile.in | 2 -- Makefile.real | 8 -------- configure.ac | 12 ------------ 3 files changed, 22 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7818f435..94b64827 100644 --- 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 d54a80da..1385bb9f 100644 --- 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 953a9d21..f9115fd6 100644 --- 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([[ -- 2.39.5