vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sat Nov 6 12:46:40 2010 +0200| [59b2e8193bf6711e12eae39b37b4592d7db1d81d] | committer: Rémi Denis-Courmont
Restore Linux builds This reverts commit 884eaa35b9160cf34c901449502a74ce5717fc78. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59b2e8193bf6711e12eae39b37b4592d7db1d81d --- configure.ac | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 99f9815..ca47abc 100644 --- a/configure.ac +++ b/configure.ac @@ -94,22 +94,6 @@ 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" -]) - dnl dnl Check for the contrib directory @@ -423,6 +407,23 @@ 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 _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
