Kaydet (Commit) 4426b03a authored tarafından Michael Meeks's avatar Michael Meeks

initial configure pieces for VLC detection.

Change-Id: I1001d7f87c3e3194c04ea9d1ef97a87898f891ea
üst 60c19683
......@@ -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@
......
......@@ -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.]),
......@@ -9909,6 +9914,27 @@ AC_SUBST(GSTREAMER_0_10_CFLAGS)
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 ===================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment