Merge pull request #5990 from orbea/revert-5983-patch-1

Revert "config.libs.sh: reintroduce HAVE_X11 check"
This commit is contained in:
Twinaphex 2017-12-29 21:08:10 +01:00 committed by GitHub
commit c4049946ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -395,16 +395,15 @@ fi
check_pkgconf V4L2 libv4l2
check_pkgconf FREETYPE freetype2
check_pkgconf X11 x11
check_pkgconf XCB xcb
if [ "$HAVE_X11" != 'no' ] && [ "$OS" != 'Darwin' ]; then
if [ "$HAVE_X11" != 'no' ]; then
check_pkgconf X11 x11
check_val '' X11 -lX11
fi
check_pkgconf XCB xcb
check_pkgconf WAYLAND wayland-egl
check_pkgconf WAYLAND_CURSOR wayland-cursor
check_pkgconf XKBCOMMON xkbcommon 0.3.2
check_pkgconf DBUS dbus-1
check_pkgconf XEXT xext