[vlc-commits] configure.ac: Allow automake to know if matroska is enabled or not

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Feb 28 17:43:48 2018 +0100| [156ceb73e2f46618a6cffb081e71e368a315ec3e] | committer: Hugo Beauzée-Luyssen

configure.ac: Allow automake to know if matroska is enabled or not

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=156ceb73e2f46618a6cffb081e71e368a315ec3e
---

 configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c03533e6d7..55335580e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2141,7 +2141,13 @@ fi
 dnl
 dnl  matroska demux plugin
 dnl
-PKG_ENABLE_MODULES_VLC([MATROSKA], [mkv], [libebml libmatroska], [MKV format support], [auto])
+PKG_WITH_MODULES([MATROSKA], [libebml libmatroska], [
+       VLC_ADD_PLUGIN([mkv])
+       VLC_ADD_CFLAGS([mkv], [$MATROSKA_CFLAGS])
+       VLC_ADD_LIBS([mkv], [$MATROSKA_LIBS])
+       have_matroska="yes"
+   ],,[MKV format support], [auto])
+AM_CONDITIONAL([HAVE_MATROSKA], [test "${have_matroska}" = "yes"])
 
 dnl
 dnl  modplug demux plugin