]> git.sesse.net Git - vlc/commitdiff
MKV: force EBML_STRICT_API
authorJean-Baptiste Kempf <jb@videolan.org>
Sun, 30 Jan 2011 19:58:29 +0000 (20:58 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Sun, 30 Jan 2011 19:58:29 +0000 (20:58 +0100)
configure.ac

index 4744372ad874ab43d8baeba238bb49f404db1534..ea6c71133d0ec5b893b69339dc24fb2e1b284c59 100644 (file)
@@ -2374,21 +2374,21 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
              #endif],
             [AC_MSG_RESULT([yes])
               AC_CHECK_HEADERS(matroska/KaxAttachments.h)
-              VLC_ADD_CXXFLAGS([mkv],[])
+              VLC_ADD_CXXFLAGS([mkv],[-DEBML_STRICT_API])
               if test "${SYS}" = "darwin"; then
                 VLC_ADD_CXXFLAGS([mkv],[-O1])
               fi
               AC_CHECK_LIB(ebml_pic, main, [
                 VLC_ADD_PLUGIN([mkv])
                 VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic])
-              ],
+              ],[
                 AC_CHECK_LIB(ebml, main, [
                   VLC_ADD_PLUGIN([mkv])
                   VLC_ADD_LIBS([mkv],[-lmatroska -lebml])
                 ])
-      )
-            ],
-            [AC_MSG_RESULT([no])
+              ])
+            ], [
+              AC_MSG_RESULT([no])
               AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.])
           ])
         ])