Commit 4189e7a5 authored by Rafaël Carré's avatar Rafaël Carré

Fix static modules

parent 3eb62f66
......@@ -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])
......
......@@ -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 =
......
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