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

[Michael Meeks]

 avmedia/Library_avmediavlc.mk |    2 --
 config_host.mk.in             |    2 --
 configure.ac                  |    4 ----
 3 files changed, 8 deletions(-)

New commits:
commit a62140cb57e67eb45844168ee51be2511d3591c9
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Aug 21 12:28:12 2013 +0100

    avmedia: vlc - with the wrapper we no longer need cflags / libs.
    
    Change-Id: I824aa1e7908acefe898b7f24b323426f1cce250c

diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 66d1b3d..832e746 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -14,9 +14,7 @@ $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmedia
 $(eval $(call gb_Library_set_include,avmediavlc,\
     $$(INCLUDE) \
     -I$(SRCDIR)/avmedia/source/inc \
-    $(VLC_CFLAGS) \
 ))
-$(eval $(call gb_Library_add_libs,avmediavlc,$(VLC_LIBS)))
 
 $(eval $(call gb_Library_use_external,avmediavlc,boost_headers))
 
diff --git a/config_host.mk.in b/config_host.mk.in
index cdba821..01fbdb8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -556,8 +556,6 @@ export VCVER=@VCVER@
 export VERBOSE=@VERBOSE@
 export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@
 export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@
-export VLC_CFLAGS=@VLC_CFLAGS@
-export VLC_LIBS=@VLC_LIBS@
 export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
 export WGET=@WGET@
 export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@
diff --git a/configure.ac b/configure.ac
index 7ad502b..8dcdcd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10088,18 +10088,14 @@ 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])
-        PKG_CHECK_MODULES( VLC, libvlc >= 2.0.0 )
     else
         AC_MSG_RESULT([no])
     fi
 fi
-AC_SUBST(VLC_CFLAGS)
-AC_SUBST(VLC_LIBS)
 AC_SUBST(ENABLE_VLC)
 
 dnl ===================================================================