Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
68472916
Commit
68472916
authored
Apr 10, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not hardcode libdl (fix #3506)
parent
2c54f289
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
9 deletions
+17
-9
bin/Makefile.am
bin/Makefile.am
+1
-1
configure.ac
configure.ac
+16
-8
No files found.
bin/Makefile.am
View file @
68472916
...
...
@@ -47,7 +47,7 @@ if HAVE_WIN32
vlc_LDADD
+=
-lwininet
vlc_win32_rc.
$(OBJEXT)
vlc_DEPENDENCIES
+=
vlc_win32_rc.
$(OBJEXT)
else
vlc_LDADD
+=
-ldl
vlc_LDADD
+=
$(LIBDL)
endif
.rc.in.rc
:
$(top_builddir)/config.status
...
...
configure.ac
View file @
68472916
...
...
@@ -749,22 +749,30 @@ if test "${ac_cv_have_plugins}" = "no"; then
fi
# Only test for dlopen() if the others didn't work
LIBDL=""
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
ac_cv_my_have_dlopen=no
AC_CHECK_FUNC(dlopen,
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
AC_CHECK_FUNC(dlopen, [
ac_cv_my_have_dlopen=yes
], [
AC_CHECK_LIB(dl, dlopen, [
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
LIBDL="-ldl"
], [
AC_CHECK_LIB(svld, dlopen, [
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore],[-lsvld]))))
LIBDL="-lsvld"
])
])
])
if test "${ac_cv_my_have_dlopen}" = "yes"; then
AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API])
ac_cv_have_plugins=yes
VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL]),
fi
fi
AC_SUBST(LIBDL)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
dnl Check for pthreads - borrowed from XMMS
...
...
@@ -2567,7 +2575,7 @@ AC_ARG_ENABLE(omxil,
if test "${enable_omxil}" = "yes"
then
VLC_ADD_PLUGIN([omxil])
VLC_ADD_LIBS([omxil], [
-ldl
])
VLC_ADD_LIBS([omxil], [
$LIBDL
])
fi
dnl
...
...
@@ -3657,7 +3665,7 @@ if test "${enable_directfb}" = "yes"; then
LIBS="${LIBS_save}"
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}"
fi
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment