Commit 5282cbf1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Define explicit makefile variable for libpthread

parent fcc20e92
...@@ -30,7 +30,7 @@ vlc_wrapper_SOURCES = rootwrap.c ...@@ -30,7 +30,7 @@ vlc_wrapper_SOURCES = rootwrap.c
vlc_wrapper_LDADD = $(SOCKET_LIBS) vlc_wrapper_LDADD = $(SOCKET_LIBS)
vlc_LDFLAGS = $(LDFLAGS_vlc) vlc_LDFLAGS = $(LDFLAGS_vlc)
vlc_LDADD = ../lib/libvlc.la $(LIBS_vlc) vlc_LDADD = ../lib/libvlc.la $(LIBPTHREAD)
vlc_static_SOURCES = $(vlc_SOURCES) vlc_static_SOURCES = $(vlc_SOURCES)
vlc_static_CFLAGS = $(AM_CFLAGS) \ vlc_static_CFLAGS = $(AM_CFLAGS) \
......
...@@ -658,12 +658,14 @@ AC_SUBST(LIBDL) ...@@ -658,12 +658,14 @@ AC_SUBST(LIBDL)
VLC_ADD_LIBS([lua],[$LIBDL]) VLC_ADD_LIBS([lua],[$LIBDL])
dnl Check for thread library dnl Check for thread library
if test "${SYS}" != "mingw32"; then LIBPTHREAD=""
AS_IF([test "${SYS}" != "mingw32"], [
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
LIBS="" LIBS=""
AC_SEARCH_LIBS(pthread_rwlock_init, pthread pthreads c_r, [ AC_SEARCH_LIBS(pthread_rwlock_init, pthread pthreads c_r, [
VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${LIBS}]) AS_IF([test "$ac_cv_search_pthread_rwlock_init" != "none required"], [
LIBPTHREAD="$ac_cv_search_pthread_rwlock_init"
])
]) ])
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
...@@ -682,7 +684,8 @@ if test "${SYS}" != "mingw32"; then ...@@ -682,7 +684,8 @@ if test "${SYS}" != "mingw32"; then
dnl HP/UX port dnl HP/UX port
AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])]) AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])])
]) ])
fi # end "${SYS}" != "mingw32" ])
AC_SUBST(LIBPTHREAD)
dnl Check for headers dnl Check for headers
AC_CHECK_HEADERS([search.h]) AC_CHECK_HEADERS([search.h])
......
...@@ -55,8 +55,8 @@ libvlc_la_SOURCES = \ ...@@ -55,8 +55,8 @@ libvlc_la_SOURCES = \
../src/revision.c ../src/revision.c
EXTRA_DIST = libvlc.pc.in libvlc.sym ../include/vlc/libvlc_version.h.in EXTRA_DIST = libvlc.pc.in libvlc.sym ../include/vlc/libvlc_version.h.in
libvlc_la_LIBADD = $(LIBS_libvlc) \ libvlc_la_LIBADD = \
../src/libvlccore.la ../compat/libcompat.la $(LIBM) ../src/libvlccore.la ../compat/libcompat.la $(LIBPTHREAD) $(LIBM)
libvlc_la_LDFLAGS = \ libvlc_la_LDFLAGS = \
$(LDFLAGS_libvlc) \ $(LDFLAGS_libvlc) \
-no-undefined \ -no-undefined \
......
...@@ -31,7 +31,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \ ...@@ -31,7 +31,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
-export-symbols-regex ^vlc_entry \ -export-symbols-regex ^vlc_entry \
-shrext $(LIBEXT) \ -shrext $(LIBEXT) \
-no-undefined -no-undefined
AM_LIBADD = $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LIBS_plugin) AM_LIBADD = $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LIBPTHREAD)
include $(srcdir)/Modules.am include $(srcdir)/Modules.am
......
...@@ -189,7 +189,7 @@ libvlccore_la_LDFLAGS = \ ...@@ -189,7 +189,7 @@ libvlccore_la_LDFLAGS = \
libvlccore_la_LIBADD = $(LIBS_libvlccore) \ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
../compat/libcompat.la \ ../compat/libcompat.la \
$(LTLIBINTL) $(LTLIBICONV) \ $(LTLIBINTL) $(LTLIBICONV) \
$(IDN_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM) $(IDN_LIBS) $(LIBPTHREAD) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
libvlccore_la_DEPENDENCIES = libvlccore.sym libvlccore_la_DEPENDENCIES = libvlccore.sym
if HAVE_WIN32 if HAVE_WIN32
libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
......
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