[vlc-commits] commit: configure: Properly fix 884eaa35. (Pierre d'Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sat Nov  6 12:08:34 2010 +0100| [f39c7c22a2112a0addeb1418a7be29e9dd871887] | committer: Pierre d'Herbemont 

configure: Properly fix 884eaa35.

Sorry for the breakage, the AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE) was lost in its way.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f39c7c22a2112a0addeb1418a7be29e9dd871887
---

 configure.ac |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index ca47abc..3fb3a2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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