Skip to content

Commit

Permalink
configure: Properly fix 884eaa3.
Browse files Browse the repository at this point in the history
Sorry for the breakage, the AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE) was lost in its way.
  • Loading branch information
pdherbemont committed Nov 7, 2010
1 parent ab68dc8 commit f39c7c2
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f39c7c2

Please sign in to comment.