[Libreoffice-commits] core.git: 2 commits - avmedia/Library_avmediavlc.mk configure.ac

[Tor Lillqvist]

 avmedia/Library_avmediavlc.mk |    2 +-
 configure.ac                  |   16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 778db6dcd701a53c3923238997e953e3f32ab909
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 29 19:03:58 2013 +0300

    Add missing line continuation character
    
    Change-Id: Ic8b786fea97361c7abaa6b57f03a3987bc7db002

diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index e7075a1..86f2778 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediavlc))
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_defs,avmediavlc,\
-    -DWINNT
+    -DWINNT \
 ))
 endif
 
commit c30715aee927721cf6648fece4f81872e7f5cf5e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 29 18:57:33 2013 +0300

    VLC is not related to gstreamer
    
    Change-Id: I3b88c1e12a254766f4d8c1de27d0cc9bd2ccbacf

diff --git a/configure.ac b/configure.ac
index 682d5dd..89ce3f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10104,19 +10104,17 @@ AC_SUBST(GSTREAMER_0_10_LIBS)
 AC_SUBST(ENABLE_GSTREAMER_0_10)
 
 dnl ===================================================================
-dnl Check whether the VLC libraries are available.
+dnl Check whether to build the VLC avmedia backend
 dnl ===================================================================
 
 ENABLE_VLC=""
 
-if test "$build_gstreamer" = "yes"; then
-    AC_MSG_CHECKING([whether to enable the new VLC avmedia backend])
-    if test "x$enable_vlc" != "xno"; then
-        ENABLE_VLC="TRUE"
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
+AC_MSG_CHECKING([whether to enable the VLC avmedia backend])
+if test $_os != iOS -a $_os != Android -a "$enable_vlc" = yes; then
+    ENABLE_VLC="TRUE"
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_VLC)