diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-29 12:08:31 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-29 12:08:31 +0100 |
| commit | 9251e48685e648bd2934b580d29f8d9e3985d018 (patch) | |
| tree | 132e48dbecac71de8af43a9c6f60f94b9a2d3fec | |
| parent | some Worksheet.Change support (diff) | |
| download | core-9251e48685e648bd2934b580d29f8d9e3985d018.tar.gz core-9251e48685e648bd2934b580d29f8d9e3985d018.zip | |
initial configure pieces for VLC detection.
Change-Id: I1001d7f87c3e3194c04ea9d1ef97a87898f891ea
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.ac | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index a3770a5ecb70..0fbae360fd68 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -157,6 +157,7 @@ export ENABLE_TDE=@ENABLE_TDE@ export ENABLE_TDEAB=@ENABLE_TDEAB@ export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@ +export ENABLE_VLC=@ENABLE_VLC@ export EPM=@EPM@ export EPM_FLAGS=@EPM_FLAGS@ export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@ @@ -534,6 +535,8 @@ 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 13f84e9c3659..40032908501d 100644 --- a/configure.ac +++ b/configure.ac @@ -1001,6 +1001,11 @@ AC_ARG_ENABLE(gstreamer-0-10, [Disable building the gstreamer avmedia backend.]), ,enable_gstreamer_0_10=yes) +AC_ARG_ENABLE(vlc, + AS_HELP_STRING([--enable-vlc], + [Enable building with the VLC avmedia backend.]), +,enable_vlc=no) + AC_ARG_ENABLE(neon, AS_HELP_STRING([--disable-neon], [Disable neon and the compilation of webdav binding.]), @@ -9587,6 +9592,27 @@ AC_SUBST(GSTREAMER_0_10_LIBS) AC_SUBST(ENABLE_GSTREAMER_0_10) dnl =================================================================== +dnl Check whether the VLC libraries are available. +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 =================================================================== dnl Check whether the OpenGL libraries are available dnl =================================================================== |