Commit 902dd36b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

configure: remove LIBPTHREAD

POSIX threads are always enabled implicitly.
parent c6dafa85
......@@ -23,7 +23,7 @@ endif
#
# Main VLC executable
#
vlc_LDADD = ../lib/libvlc.la $(LIBPTHREAD)
vlc_LDADD = ../lib/libvlc.la
vlc_CPPFLAGS = $(AM_CPPFLAGS)
if !HAVE_WIN32
vlc_SOURCES = vlc.c override.c
......
......@@ -789,20 +789,6 @@ AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"])
AC_SUBST(LIBDL)
dnl Check for thread library
LIBPTHREAD=""
AS_IF([test "${SYS}" != "mingw32"], [
VLC_SAVE_FLAGS
LIBS=""
AC_SEARCH_LIBS(pthread_rwlock_init, pthread pthreads c_r, [
AS_IF([test "$ac_cv_search_pthread_rwlock_init" != "none required"], [
LIBPTHREAD="$ac_cv_search_pthread_rwlock_init"
])
])
VLC_RESTORE_FLAGS
])
AC_SUBST(LIBPTHREAD)
AC_SEARCH_LIBS([clock_nanosleep], [rt pthread], [
AS_IF([test "$ac_cv_search_clock_nanosleep" != "none required"], [
LIBRT="$ac_cv_search_clock_nanosleep"
......@@ -4241,7 +4227,7 @@ dnl
dnl Fuzzer (at the end in order to don't mess dependencies FLAGS)
dnl
AS_VAR_IF(with_libfuzzer, no, [], [
LIBS="-lstdc++ ${LIBM} ${LIBPTHREAD} -L${with_libfuzzer} -lFuzzer"
LIBS="-lstdc++ ${LIBM} -L${with_libfuzzer} -lFuzzer"
AX_CHECK_COMPILE_FLAG(-fsanitize-coverage=trace-pc-guard, [
AX_APPEND_FLAG([-fsanitize-coverage=trace-pc-guard])
AX_APPEND_FLAG([-fsanitize-coverage=trace-pc-guard], [CXXFLAGS])
......
......@@ -55,8 +55,7 @@ libvlc_la_SOURCES = \
media_discoverer.c
EXTRA_DIST = libvlc.pc.in libvlc.sym ../include/vlc/libvlc_version.h.in
libvlc_la_LIBADD = \
../src/libvlccore.la ../compat/libcompat.la $(LIBPTHREAD) $(LIBM)
libvlc_la_LIBADD = ../src/libvlccore.la ../compat/libcompat.la $(LIBM)
libvlc_la_LDFLAGS = \
$(LDFLAGS_libvlc) \
-no-undefined \
......
......@@ -106,7 +106,7 @@ EXTRA_LTLIBRARIES += libdc1394_plugin.la
libdv1394_plugin_la_SOURCES = access/dv.c
libdv1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DV1394_CFLAGS)
libdv1394_plugin_la_LIBADD = $(DV1394_LIBS) $(LIBPTHREAD)
libdv1394_plugin_la_LIBADD = $(DV1394_LIBS)
libdv1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdv1394)
EXTRA_LTLIBRARIES += libdv1394_plugin.la
......@@ -116,7 +116,6 @@ liblinsys_hdsdi_plugin_la_SOURCES = \
access/linsys/linsys_sdivideo.h \
access/linsys/linsys_hdsdi.c
liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
liblinsys_hdsdi_plugin_la_LIBADD = $(LIBPTHREAD)
liblinsys_sdi_plugin_la_SOURCES = access/linsys/linsys_sdi.c access/linsys/linsys_sdi.h
liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
liblinsys_sdi_plugin_la_LIBADD = $(LINSYS_SDI_LIBS)
......@@ -150,7 +149,7 @@ libv4l2_plugin_la_SOURCES = \
access/v4l2/v4l2.h
libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/v4l2
libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS)
libv4l2_plugin_la_LIBADD = $(LIBDL) $(LIBM) $(ZVBI_LIBS) $(LIBPTHREAD)
libv4l2_plugin_la_LIBADD = $(LIBDL) $(LIBM) $(ZVBI_LIBS)
if HAVE_V4L2
access_LTLIBRARIES += libv4l2_plugin.la
endif
......@@ -180,8 +179,7 @@ nodist_libwl_screenshooter_plugin_la_SOURCES = \
access/screen/screenshooter-protocol.c
libwl_screenshooter_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -Iaccess/screen
libwl_screenshooter_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
libwl_screenshooter_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) \
$(LIBPTHREAD) $(LIBM)
libwl_screenshooter_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBM)
EXTRA_DIST += access/screen/screenshooter.xml
CLEANFILES += $(nodist_libwl_screenshooter_plugin_la_SOURCES)
if HAVE_WAYLAND
......@@ -360,7 +358,7 @@ libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libtcp_plugin.la
libudp_plugin_la_SOURCES = access/udp.c
libudp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
libudp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libudp_plugin.la
libunc_plugin_la_SOURCES = access/unc.c access/smb_common.h
......@@ -409,7 +407,7 @@ endif
endif
libsatip_plugin_la_SOURCES = access/satip.c
libsatip_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
libsatip_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libsatip_plugin.la
### Misc ###
......
......@@ -15,9 +15,7 @@ libvlc_http_la_SOURCES = \
access/http/chunked.c access/http/tunnel.c access/http/conn.h \
access/http/connmgr.c access/http/connmgr.h
libvlc_http_la_CPPFLAGS = -Dneedsomethinghere
libvlc_http_la_LIBADD = \
$(LTLIBVLCCORE) ../compat/libcompat.la \
$(SOCKET_LIBS) $(LIBPTHREAD)
libvlc_http_la_LIBADD = $(LTLIBVLCCORE) ../compat/libcompat.la $(SOCKET_LIBS)
#libvlc_http_la_LDFLAGS = -no-undefined -export-symbols-regex ^vlc_http_
#pkglib_LTLIBRARIES += libvlc_http.la
libvlc_http_la_LDFLAGS = -static
......@@ -31,9 +29,9 @@ h2frame_test_SOURCES = access/http/h2frame_test.c \
access/http/hpack.c access/http/hpack.h access/http/hpackenc.c \
access/http/h2frame.c access/http/h2frame.h
h2output_test_SOURCES = access/http/h2output_test.c
h2output_test_LDADD = libvlc_http.la $(LIBPTHREAD)
h2output_test_LDADD = libvlc_http.la
h2conn_test_SOURCES = access/http/h2conn_test.c
h2conn_test_LDADD = libvlc_http.la $(LIBPTHREAD)
h2conn_test_LDADD = libvlc_http.la
h1conn_test_SOURCES = access/http/h1conn_test.c
h1conn_test_LDADD = libvlc_http.la
h1chunked_test_SOURCES = access/http/chunked_test.c
......
......@@ -7,14 +7,14 @@ librtp_plugin_la_SOURCES = \
access/rtp/rtp.c access/rtp/rtp.h
librtp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/rtp
librtp_plugin_la_CFLAGS = $(AM_CFLAGS)
librtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
librtp_plugin_la_LIBADD = $(SOCKET_LIBS)
# Secure RTP library
libvlc_srtp_la_SOURCES = access/rtp/srtp.c access/rtp/srtp.h
libvlc_srtp_la_CPPFLAGS = -I$(srcdir)/access/rtp
libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS)
libvlc_srtp_la_LDFLAGS = -static
libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS) $(LIBPTHREAD)
libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS)
srtp_test_recv_SOURCES = access/rtp/srtp-test-recv.c
srtp_test_recv_LDADD = libvlc_srtp.la
srtp_test_aes_SOURCES = access/rtp/srtp-test-aes.c
......
......@@ -2,10 +2,9 @@ access_outdir = $(pluginsdir)/access_output
libaccess_output_dummy_plugin_la_SOURCES = access_output/dummy.c
libaccess_output_file_plugin_la_SOURCES = access_output/file.c
libaccess_output_file_plugin_la_LIBADD = $(LIBPTHREAD)
libaccess_output_http_plugin_la_SOURCES = access_output/http.c
libaccess_output_udp_plugin_la_SOURCES = access_output/udp.c
libaccess_output_udp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
libaccess_output_udp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_out_LTLIBRARIES = \
libaccess_output_dummy_plugin.la \
......@@ -31,7 +30,7 @@ EXTRA_LTLIBRARIES += libaccess_output_shout_plugin.la
libaccess_output_srt_plugin_la_SOURCES = access_output/srt.c
libaccess_output_srt_plugin_la_CFLAGS = $(AM_CFLAGS) $(SRT_CFLAGS)
libaccess_output_srt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SRT_CPPFLAGS)
libaccess_output_srt_plugin_la_LIBADD = $(SRT_LIBS) $(LIBPTHREAD)
libaccess_output_srt_plugin_la_LIBADD = $(SRT_LIBS)
libaccess_output_srt_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(access_outdir)'
access_out_LTLIBRARIES += $(LTLIBaccess_output_srt)
EXTRA_LTLIBRARIES += libaccess_output_srt_plugin.la
......@@ -564,7 +564,7 @@ libaom_plugin_la_SOURCES = codec/aom.c
libaom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libaom_plugin_la_CFLAGS = $(AM_CFLAGS) $(AOM_CFLAGS) $(CPPFLAGS_aom)
libaom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libaom_plugin_la_LIBADD = $(AOM_LIBS) $(LIBPTHREAD)
libaom_plugin_la_LIBADD = $(AOM_LIBS)
EXTRA_LTLIBRARIES += libaom_plugin.la
codec_LTLIBRARIES += $(LTLIBaom)
......
......@@ -3,7 +3,7 @@ gui_LTLIBRARIES =
libncurses_plugin_la_SOURCES = gui/ncurses.c
libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBM)
if HAVE_NCURSES
gui_LTLIBRARIES += libncurses_plugin.la
endif
......
......@@ -2,8 +2,7 @@ vdpaudir = $(pluginsdir)/vdpau
libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h hw/vdpau/instance.c
libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 \
$(LIBDL) $(LIBPTHREAD)
libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(LIBDL)
libvlc_vdpau_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex ^vdp_ \
......
......@@ -36,7 +36,7 @@ if HAVE_WIN32
liblua_plugin_la_SOURCES += lua/libs/win.c
endif
liblua_plugin_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) -I$(srcdir)/lua
liblua_plugin_la_LIBADD = $(LUA_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM) $(LIBPTHREAD)
liblua_plugin_la_LIBADD = $(LUA_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
if BUILD_LUA
lua_LTLIBRARIES = liblua_plugin.la
endif
......@@ -6,7 +6,7 @@ libstats_plugin_la_SOURCES = misc/stats.c
misc_LTLIBRARIES = liblogger_plugin.la libstats_plugin.la
libaudioscrobbler_plugin_la_SOURCES = misc/audioscrobbler.c
libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS)
misc_LTLIBRARIES += libaudioscrobbler_plugin.la
libexport_plugin_la_SOURCES = \
......@@ -21,7 +21,7 @@ libfingerprinter_plugin_la_SOURCES = \
misc/webservices/json.c misc/webservices/json.h \
misc/fingerprinter.c
libfingerprinter_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/misc
libfingerprinter_plugin_la_LIBADD = $(LIBM) $(LIBPTHREAD)
libfingerprinter_plugin_la_LIBADD = $(LIBM)
misc_LTLIBRARIES += libfingerprinter_plugin.la
libgnutls_plugin_la_SOURCES = misc/gnutls.c
......
......@@ -5,7 +5,6 @@ libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c
sd_LTLIBRARIES += libmediadirs_plugin.la
libpodcast_plugin_la_SOURCES = services_discovery/podcast.c
libpodcast_plugin_la_LIBADD = $(LIBPTHREAD)
sd_LTLIBRARIES += libpodcast_plugin.la
libsap_plugin_la_SOURCES = services_discovery/sap.c
......
......@@ -32,7 +32,7 @@ endif
libremoteosd_plugin_la_SOURCES = spu/remoteosd.c spu/remoteosd_rfbproto.h
libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(SOCKET_LIBS) $(LIBPTHREAD)
libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(SOCKET_LIBS)
if HAVE_GCRYPT
spu_LTLIBRARIES += libremoteosd_plugin.la
endif
......@@ -9,7 +9,6 @@ libcache_block_plugin_la_SOURCES = stream_filter/cache_block.c
stream_filter_LTLIBRARIES += libcache_block_plugin.la
libdecomp_plugin_la_SOURCES = stream_filter/decomp.c
libdecomp_plugin_la_LIBADD = $(LIBPTHREAD)
if !HAVE_WIN32
if !HAVE_TVOS
stream_filter_LTLIBRARIES += libdecomp_plugin.la
......@@ -23,7 +22,6 @@ stream_filter_LTLIBRARIES += libinflate_plugin.la
endif
libprefetch_plugin_la_SOURCES = stream_filter/prefetch.c
libprefetch_plugin_la_LIBADD = $(LIBPTHREAD)
if !HAVE_WINSTORE
stream_filter_LTLIBRARIES += libprefetch_plugin.la
endif
......
......@@ -50,7 +50,7 @@ libstream_out_rtp_plugin_la_SOURCES = \
stream_out/rtp.c stream_out/rtp.h stream_out/rtpfmt.c \
stream_out/rtcp.c stream_out/rtsp.c stream_out/vod.c
libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBPTHREAD)
libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS)
if HAVE_GCRYPT
SRTP_CFLAGS = -I$(srcdir)/access/rtp
SRTP_LIBS = libvlc_srtp.la
......
......@@ -228,7 +228,7 @@ libxdg_shell_plugin_la_CFLAGS = \
$(XKBCOMMON_CFLAGS)
libxdg_shell_plugin_la_LIBADD = \
$(WAYLAND_CLIENT_LIBS) $(WAYLAND_CURSOR_LIBS) \
$(XKBCOMMON_LIBS) $(LIBPTHREAD)
$(XKBCOMMON_LIBS)
if HAVE_XKBCOMMON
libwl_shell_plugin_la_CPPFLAGS += -DHAVE_XKBCOMMON
libxdg_shell_plugin_la_CPPFLAGS += -DHAVE_XKBCOMMON
......
......@@ -21,7 +21,7 @@ visu_LTLIBRARIES += $(LTLIBgoom)
libprojectm_plugin_la_SOURCES = visualization/projectm.cpp
libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
libprojectm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS) $(LIBPTHREAD)
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS)
EXTRA_LTLIBRARIES += libprojectm_plugin.la
visu_LTLIBRARIES += $(LTLIBprojectm)
......
......@@ -360,7 +360,7 @@ libvlccore_la_SOURCES = \
libvlccore_la_LIBADD = $(LIBS_libvlccore) \
../compat/libcompat.la \
$(LTLIBINTL) $(LTLIBICONV) \
$(IDN_LIBS) $(LIBPTHREAD) $(SOCKET_LIBS) $(LIBRT) $(LIBDL) $(LIBM)
$(IDN_LIBS) $(SOCKET_LIBS) $(LIBRT) $(LIBDL) $(LIBM)
if HAVE_WIN32
libvlccore_la_SOURCES += \
......@@ -532,7 +532,7 @@ test_block_DEPENDENCIES =
test_dictionary_SOURCES = test/dictionary.c
test_i18n_atof_SOURCES = test/i18n_atof.c
test_interrupt_SOURCES = test/interrupt.c
test_interrupt_LDADD = $(LDADD) $(LIBS_libvlccore) $(LIBPTHREAD)
test_interrupt_LDADD = $(LDADD) $(LIBS_libvlccore)
test_list_SOURCES = test/list.c
test_md5_SOURCES = test/md5.c
test_picture_pool_SOURCES = test/picture_pool.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment