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

Cleanup dlopen detection

parent 532049f6
...@@ -692,48 +692,31 @@ AC_CHECK_LIB(m,lrintf, [ ...@@ -692,48 +692,31 @@ AC_CHECK_LIB(m,lrintf, [
]) ])
dnl Check for dynamic plugins dnl Check for dynamic plugins
ac_cv_have_plugins=no LIBDL="no"
LIBS_save="$LIBS"
# Win32 style AC_SEARCH_LIBS(dlopen, [dl svld], [
if test "${ac_cv_have_plugins}" = "no"; then AS_IF([test "$ac_cv_search_dlopen" != "none required"], [
if test "${SYS}" = "mingw32" ; then LIBDL="$ac_cv_search_dlopen"
AC_CHECK_LIB(kernel32, main, ])
[VLC_ADD_LIBS([libvlccore],[-lkernel32]) ])
ac_cv_have_plugins=yes]) LIBS="$LIBS_save"
fi
fi
# WinCE style # Windows
if test "${ac_cv_have_plugins}" = "no"; then AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
if test "${SYS}" = "mingwce"; then LIBDL=""
ac_cv_have_plugins=yes ])
fi
fi
# Only test for dlopen() if the others didn't work AS_IF([test "$LIBDL" != "no"], [
LIBDL="" AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1,
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then [Define to 1 if dynamic plugins are supported.])
ac_cv_my_have_dlopen=no ], [
AC_CHECK_FUNC(dlopen, [ dnl Clear $LIBDL so as not to break linking
ac_cv_my_have_dlopen=yes LIBDL=""
], [ ])
AC_CHECK_LIB(dl, dlopen, [
ac_cv_my_have_dlopen=yes
LIBDL="-ldl"
], [
AC_CHECK_LIB(svld, dlopen, [
ac_cv_my_have_dlopen=yes
LIBDL="-lsvld"
])
])
])
if test "${ac_cv_my_have_dlopen}" = "yes"; then
ac_cv_have_plugins=yes
VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL])
fi
fi
AC_SUBST(LIBDL) AC_SUBST(LIBDL)
VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL])
dnl Check for thread library
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
THREAD_LIB=error THREAD_LIB=error
...@@ -4211,23 +4194,6 @@ AC_ARG_ENABLE(vlc, ...@@ -4211,23 +4194,6 @@ AC_ARG_ENABLE(vlc,
AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"]) AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"])
dnl
dnl Plugin and builtin checks
dnl
plugin_support=yes
dnl Automagically disable plugins if there is no system support for
dnl dynamically loadable files (.so, .dll, .dylib).
dnl don't forget vlc-win32 still can load .dll as plugins
AS_IF([test "${ac_cv_have_plugins}" = "no"], [
AC_MSG_WARN([*** No plugin support! Building statically! ***])
plugin_support=no
])
AS_IF([test "${plugin_support}" != "no"], [
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, [Define if dynamic plugins are supported])
])
dnl dnl
dnl Pic and shared libvlc stuff dnl Pic and shared libvlc stuff
dnl dnl
......
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