summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-05-29 12:08:31 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-07-26 07:03:32 +0100
commit9140c7c6ac3841cdc125312692435aebe2e9e1bc (patch)
treea3b25701f5bd3ec70c3d834d311bf79f0ba1886f
parent084b7d8e71270f90e1f41d373a2b95d4ddc18b88 (diff)
initial configure pieces for VLC detection.
Change-Id: I1001d7f87c3e3194c04ea9d1ef97a87898f891ea
-rw-r--r--config_host.mk.in3
-rw-r--r--configure.ac26
2 files changed, 29 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 6fb1cc88e734..a96bfbad55aa 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -163,6 +163,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@
@@ -545,6 +546,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 10ffd2acb1d7..697183fedbfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,6 +1015,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.]),
@@ -9910,6 +9915,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 ===================================================================