From 18925e8fdb40c6c137e5de750af3b932e4d71a4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 29 Aug 2011 08:51:05 -0400 Subject: [PATCH] Build plugins statically if --disable-shared is used Only allow static plugins if vlc binary is not built --- configure.ac | 4 +++- modules/common.am | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c484481373..9812a531ba 100644 --- a/configure.ac +++ b/configure.ac @@ -461,10 +461,12 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) 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.]) ]) +AM_CONDITIONAL(HAVE_SHARED_PLUGINS, [test "${enable_shared}" != "no"]) + dnl dnl Gettext stuff dnl diff --git a/modules/common.am b/modules/common.am index d0b2d0eca0..e2b21bf087 100644 --- a/modules/common.am +++ b/modules/common.am @@ -19,8 +19,10 @@ MODULE_NAME = `p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}"` AM_CPPFLAGS = \ -DMODULE_NAME=$(MODULE_NAME) \ -DMODULE_NAME_IS_$(MODULE_NAME) \ - -DMODULE_STRING=\"$(MODULE_NAME)\" \ - -D__PLUGIN__ + -DMODULE_STRING=\"$(MODULE_NAME)\" +if HAVE_SHARED_PLUGINS +AM_CPPFLAGS += -D__PLUGIN__ +endif AM_CFLAGS = AM_CXXFLAGS = AM_OBJCFLAGS = -- 2.39.2