Skip to content

V
vlc-2-2
Commit a77d803e authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* configure.ac: fixed matroska detection.

parent 9abee4a8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
configure.ac
View file @ a77d803e
...@@ -1383,10 +1383,10 @@ if test "${enable_mkv}" = "yes" ...@@ -1383,10 +1383,10 @@ if test "${enable_mkv}" = "yes"
then then
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
dnl matroska headers include ebml headers directly... pouah that stinks dnl matroska headers include ebml headers directly... pouah that stinks
CPPFLAGS="${CPPFLAGS_save} -I/usr/include/ebml -I/usr/include/matroska" CPPFLAGS="${CPPFLAGS_save} -I/usr/local/include/ebml -I/usr/include/ebml"
AC_CHECK_HEADERS(EbmlVersion.h KaxVersion.h, [ AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
AX_ADD_PLUGINS([mkv]) AX_ADD_PLUGINS([mkv])
AX_ADD_CXXFLAGS([mkv],[-I/usr/include/ebml -I/usr/include/matroska]) AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
],[ ],[
AC_MSG_ERROR([libebml or libmatroska include files not found]) AC_MSG_ERROR([libebml or libmatroska include files not found])
......
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