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

Do not hardcode libdl (fix #3506)

parent 2c54f289
...@@ -47,7 +47,7 @@ if HAVE_WIN32 ...@@ -47,7 +47,7 @@ if HAVE_WIN32
vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT) vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT) vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
else else
vlc_LDADD += -ldl vlc_LDADD += $(LIBDL)
endif endif
.rc.in.rc: $(top_builddir)/config.status .rc.in.rc: $(top_builddir)/config.status
......
...@@ -749,22 +749,30 @@ if test "${ac_cv_have_plugins}" = "no"; then ...@@ -749,22 +749,30 @@ if test "${ac_cv_have_plugins}" = "no"; then
fi fi
# Only test for dlopen() if the others didn't work # Only test for dlopen() if the others didn't work
LIBDL=""
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(dlfcn.h sys/dl.h) AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
ac_cv_my_have_dlopen=no ac_cv_my_have_dlopen=no
AC_CHECK_FUNC(dlopen, AC_CHECK_FUNC(dlopen, [
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]), ], [
AC_CHECK_LIB(svld, dlopen, AC_CHECK_LIB(dl, dlopen, [
ac_cv_my_have_dlopen=yes
LIBDL="-ldl"
], [
AC_CHECK_LIB(svld, dlopen, [
ac_cv_my_have_dlopen=yes ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore],[-lsvld])))) LIBDL="-lsvld"
])
])
])
if test "${ac_cv_my_have_dlopen}" = "yes"; then if test "${ac_cv_my_have_dlopen}" = "yes"; then
AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API]) AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API])
ac_cv_have_plugins=yes ac_cv_have_plugins=yes
VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL]),
fi fi
fi fi
AC_SUBST(LIBDL)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
dnl Check for pthreads - borrowed from XMMS dnl Check for pthreads - borrowed from XMMS
...@@ -2567,7 +2575,7 @@ AC_ARG_ENABLE(omxil, ...@@ -2567,7 +2575,7 @@ AC_ARG_ENABLE(omxil,
if test "${enable_omxil}" = "yes" if test "${enable_omxil}" = "yes"
then then
VLC_ADD_PLUGIN([omxil]) VLC_ADD_PLUGIN([omxil])
VLC_ADD_LIBS([omxil], [-ldl]) VLC_ADD_LIBS([omxil], [$LIBDL])
fi fi
dnl dnl
...@@ -3657,7 +3665,7 @@ if test "${enable_directfb}" = "yes"; then ...@@ -3657,7 +3665,7 @@ if test "${enable_directfb}" = "yes"; then
LIBS="${LIBS_save}" LIBS="${LIBS_save}"
if test "${have_directfb}" = "true"; then if test "${have_directfb}" = "true"; then
LIBS_mydirectfb="${LIBS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread" LIBS_mydirectfb="${LIBS_new} -lz $LIBDL -ldirectfb -lfusion -ldirect -lpthread"
CPPFLAGS_mydirectfb="${CPPFLAGS_new}" CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
fi fi
else else
......
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