Fix static modules

diff --git a/configure.ac b/configure.ac
index 8224c0090fda06e107a2f97f044b1f4ebfe68336..4f20abedc868ddbfdacc53be1729d0acd462179b 100644 (file)
--- 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 e2b21bf087403258f22393b195ca165c2864135d..3dd8ad2e4ed5e54845d4f7a8e338d7e28dfe33b5 100644 (file)
--- 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 =