[FFmpeg-cvslog] Fix disabling libxcb-shm and libxcb-xfixes.

Carl Eugen Hoyos git at videolan.org
Thu Oct 30 10:04:53 CET 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Oct 30 10:03:45 2014 +0100| [0e89d006d87a523db45878c7b3f1bcc8ba1234ed] | committer: Carl Eugen Hoyos

Fix disabling libxcb-shm and libxcb-xfixes.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e89d006d87a523db45878c7b3f1bcc8ba1234ed
---

 configure |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index fae9ca1..e6e3de3 100755
--- a/configure
+++ b/configure
@@ -5030,15 +5030,15 @@ if ! disabled libxcb; then
     } && disable x11grab && enable libxcb
 
 if enabled libxcb; then
-    disabled libxcb_shm ||
+    disabled libxcb_shm || {
         check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || {
             enabled libxcb_shm && die "ERROR: libxcb_shm not found";
-        } && check_header sys/shm.h && enable libxcb_shm
+        } && check_header sys/shm.h && enable libxcb_shm; }
 
-    disabled libxcb_xfixes ||
+    disabled libxcb_xfixes || {
         check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || {
             enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found";
-        } && enable libxcb_xfixes
+        } && enable libxcb_xfixes; }
 
     add_cflags "$xcb_event_cflags $xcb_shm_cflags $xcb_xfixes_cflags"
     add_extralibs "$xcb_event_libs $xcb_shm_libs $xcb_xfixes_libs"



More information about the ffmpeg-cvslog mailing list