X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=configure.ac;h=8fe52bb91d3e921153548d892e406ee7456c0fa7;hp=5d2710e8623c0e82f2fcba62cc391280a20c4c2b;hb=7e40556bc3fc852a68f8c3378b5d52ad59739776;hpb=d9f60cd7287eff119b4531327e3e9cb05992f32e diff --git a/configure.ac b/configure.ac index 5d2710e862..8fe52bb91d 100644 --- a/configure.ac +++ b/configure.ac @@ -2464,10 +2464,15 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then if test "${SYS}" = "darwin"; then VLC_ADD_CXXFLAGS([mkv],[-O1]) fi - AC_CHECK_LIB(ebml, main, [ + AC_CHECK_LIB(ebml_pic, main, [ VLC_ADD_PLUGINS([mkv]) - VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) - ]) + VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml_pic]) + ], + AC_CHECK_LIB(ebml, main, [ + VLC_ADD_PLUGINS([mkv]) + VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) + ]) + ) ], [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.])