Commit f39c7c22 authored by Pierre's avatar Pierre

configure: Properly fix 884eaa35.

Sorry for the breakage, the AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE) was lost in its way.
parent ab68dc86
......@@ -94,6 +94,23 @@ AS_IF([test -n "${with_binary_version}"],[
[Binary specific version])
])
dnl Check how we are asked to build
AS_IF([test "${enable_shared}" = "no"], [
AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
])
AC_ARG_ENABLE(static-modules,
[ --enable-static-modules Allow module to be linked statically. This produces a non working vlc.])
AS_IF([test "${enable_static_modules}" = yes], [
enable_shared="no"
enable_static="yes"
VLC_DEFAULT_PLUGIN_TYPE="builtin"
echo "*** WARNING: Building modules as static. VLC will not work."
], [
VLC_DEFAULT_PLUGIN_TYPE="plugin"
])
AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE)
dnl
dnl Check for the contrib directory
......@@ -407,23 +424,6 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
lt_cv_deplibs_check_method=pass_all
AS_IF([test "${enable_shared}" = "no"], [
AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
])
AC_ARG_ENABLE(static-modules,
[ --enable-static-modules Allow module to be linked statically. This produces a non working vlc.])
AS_IF([test "${enable_static_modules}" = yes], [
enable_shared="no"
enable_static="yes"
VLC_DEFAULT_PLUGIN_TYPE="builtin"
echo "*** WARNING: Building modules as static. VLC will not work."
], [
VLC_DEFAULT_PLUGIN_TYPE="plugin"
])
AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE)
dnl
dnl Gettext stuff
dnl
......
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