[vlc-commits] Fix static modules

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Sep  5 18:13:55 2011 +0200| [4189e7a558bc9380d2aa6df4789607f626092e6e] | committer: Rafaël Carré

Fix static modules

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

 configure.ac      |    8 +++++---
 modules/common.am |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8224c00..4f20abe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,8 +465,6 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [
   AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
 ])
 
-AM_CONDITIONAL(HAVE_SHARED_PLUGINS, [test "${enable_shared}" != "no"])
-
 dnl
 dnl Gettext stuff
 dnl
@@ -708,13 +706,17 @@ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
   have_dynamic_objects="yes" #assume we can use shared objects
 ])
 
-AS_IF([test "$have_dynamic_objects" != "no"], [
+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=""
 ])
+AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"])
+
 AC_SUBST(LIBDL)
 VLC_ADD_LIBS([realvideo lua],[$LIBDL])
 
diff --git a/modules/common.am b/modules/common.am
index e2b21bf..3dd8ad2 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = \
 	-DMODULE_NAME=$(MODULE_NAME) \
 	-DMODULE_NAME_IS_$(MODULE_NAME) \
 	-DMODULE_STRING=\"$(MODULE_NAME)\"
-if HAVE_SHARED_PLUGINS
+if HAVE_DYNAMIC_PLUGINS
 AM_CPPFLAGS += -D__PLUGIN__
 endif
 AM_CFLAGS =