Commit 1d3a1241 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Mozilla plugin requires XCB window plugin which requires xcb-keysyms

Otherwise we cannot render videos with X11 (and fallback to
non-embedded SDL or ASCII).
(cherry picked from commit 12e39efb9eef08b7a6d242f076205fe6d5a23469)
parent d41ff4f7
...@@ -4592,6 +4592,9 @@ then ...@@ -4592,6 +4592,9 @@ then
],[ ],[
AC_MSG_ERROR([Please install the libXpm and libXt development files.]) AC_MSG_ERROR([Please install the libXpm and libXt development files.])
]) ])
AS_IF([test "${have_xcb_keysyms}" != "yes"], [
AC_MSG_ERROR([Please install xcb-keysyms from xcb-utils.])
])
]) ])
]) ])
VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}]) VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
...@@ -4621,6 +4624,9 @@ then ...@@ -4621,6 +4624,9 @@ then
[[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm] [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm]
]) ])
AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h])) AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
AS_IF([test "${have_xcb_keysyms}" != "yes"], [
AC_MSG_ERROR([Please install xcb-keysyms from xcb-utils.])
])
LDFLAGS="${LDFLAGS_save}" LDFLAGS="${LDFLAGS_save}"
fi fi
......
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