Commit 18925e8f authored by Rafaël Carré's avatar Rafaël Carré

Build plugins statically if --disable-shared is used

Only allow static plugins if vlc binary is not built
parent 543ee6a2
...@@ -461,10 +461,12 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) ...@@ -461,10 +461,12 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
AS_IF([test "${enable_shared}" = "no"], [ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [
AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.]) AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
]) ])
AM_CONDITIONAL(HAVE_SHARED_PLUGINS, [test "${enable_shared}" != "no"])
dnl dnl
dnl Gettext stuff dnl Gettext stuff
dnl dnl
......
...@@ -19,8 +19,10 @@ MODULE_NAME = `p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}"` ...@@ -19,8 +19,10 @@ MODULE_NAME = `p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}"`
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DMODULE_NAME=$(MODULE_NAME) \ -DMODULE_NAME=$(MODULE_NAME) \
-DMODULE_NAME_IS_$(MODULE_NAME) \ -DMODULE_NAME_IS_$(MODULE_NAME) \
-DMODULE_STRING=\"$(MODULE_NAME)\" \ -DMODULE_STRING=\"$(MODULE_NAME)\"
-D__PLUGIN__ if HAVE_SHARED_PLUGINS
AM_CPPFLAGS += -D__PLUGIN__
endif
AM_CFLAGS = AM_CFLAGS =
AM_CXXFLAGS = AM_CXXFLAGS =
AM_OBJCFLAGS = AM_OBJCFLAGS =
......
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