[vlc-commits] LIBDL may be required regardless of plugins (e.g. v4l2)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep  4 16:56:02 2012 +0300| [c422a5231ac90ccca633a0552185c5af90b52d33] | committer: Rémi Denis-Courmont

LIBDL may be required regardless of plugins (e.g. v4l2)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c422a5231ac90ccca633a0552185c5af90b52d33
---

 configure.ac    |   10 ++--------
 src/Makefile.am |    3 +++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6292537..8fbcd81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,14 +649,8 @@ AS_IF([test "${SYS}" = "mingw32"], [
   have_dynamic_objects="yes" #assume we can use shared objects
 ])
 
-test "${enable_shared}" = "no" && have_dynamic_objects=no
-
-AS_IF([test "${have_dynamic_objects}" != "no"], [
-  AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1,
-            [Define to 1 if dynamic plugins are supported.])
-], [
-  dnl Clear $LIBDL so as not to break linking
-  LIBDL=""
+AS_IF([test "${enable_shared}" = "no"], [
+  have_dynamic_objects=no
 ])
 AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 35b83d8..9572480 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,6 +171,9 @@ AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
 	-DPKGDATADIR=\"$(vlcdatadir)\" \
 	-DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)
+if HAVE_DYNAMIC_PLUGINS
+AM_CPPFLAGS += -DHAVE_DYNAMIC_PLUGINS
+endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
 libvlccore_la_LDFLAGS = \