diff mbox

[FFmpeg-devel,2/2] configure: simplify checks for libxcb dependent features

Message ID 20170927181908.1092-2-jamrial@gmail.com
State Superseded
Headers show

Commit Message

James Almer Sept. 27, 2017, 6:19 p.m. UTC
---
 configure | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Michael Niedermayer Sept. 28, 2017, 8:35 p.m. UTC | #1
On Wed, Sep 27, 2017 at 03:19:08PM -0300, James Almer wrote:
> ---
>  configure | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)

maybe i did something silly but this breaks configure here
./configure: 1275: shift: can't shift that many

use_pkg_config needs one more argument

[...]
James Almer Sept. 28, 2017, 8:44 p.m. UTC | #2
On 9/28/2017 5:35 PM, Michael Niedermayer wrote:
> On Wed, Sep 27, 2017 at 03:19:08PM -0300, James Almer wrote:
>> ---
>>  configure | 10 +++-------
>>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> maybe i did something silly but this breaks configure here

No, you didn't. I actually forgot to reply saying this patch is dropped
as a merge i applied breaks it.
Should have waited in retrospect until i was done with this configure
merge batch.

> ./configure: 1275: shift: can't shift that many
>
> use_pkg_config needs one more argument

I'll send an updated version of this set soon. Sorry about that.
diff mbox

Patch

diff --git a/configure b/configure
index 1676215146..5b3e2ecdbf 100755
--- a/configure
+++ b/configure
@@ -6189,13 +6189,9 @@  fi
 enabled libxcb && check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || disable libxcb libxcb_shm libxcb_shape libxcb_xfixes
 
 if enabled libxcb; then
-
-    enabled libxcb_shm    && check_pkg_config xcb-shm    xcb/shm.h    xcb_shm_attach              || disable libxcb_shm
-    enabled libxcb_shape  && check_pkg_config xcb-shape  xcb/shape.h  xcb_shape_get_rectangles    || disable libxcb_shape
-    enabled libxcb_xfixes && check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes
-
-    add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags
-    add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs
+    enabled libxcb_shm    && use_pkg_config xcb-shm    xcb/shm.h    xcb_shm_attach              || disable libxcb_shm
+    enabled libxcb_shape  && use_pkg_config xcb-shape  xcb/shape.h  xcb_shape_get_rectangles    || disable libxcb_shape
+    enabled libxcb_xfixes && use_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes
 fi
 
 check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"