1From e1f9b0b531c6ddb11a85c0664051e2e4efc589fb Mon Sep 17 00:00:00 2001 2From: Ming Liu <ming.liu@toradex.com> 3Date: Sun, 5 May 2019 11:55:14 +0200 4Subject: [PATCH] Drop x11 dependencies 5 6Upstream-Status: Inappropriate [OE-Specific] 7 8Signed-off-by: Ming Liu <ming.liu@toradex.com> 9--- 10 configure.ac | 44 -------------------------------------------- 11 1 file changed, 44 deletions(-) 12 13diff --git a/configure.ac b/configure.ac 14index a5fd706..b42488c 100644 15--- a/configure.ac 16+++ b/configure.ac 17@@ -76,27 +76,8 @@ fi 18 AC_SUBST([EXEEXT_FOR_BUILD]) 19 20 # Checks for pkg-config packages 21- 22-# Always required 23-X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1' 24-X11_EXTRA_DEPS="xcb >= 1.11.1" 25- 26 PKG_PROG_PKG_CONFIG() 27 28-AC_SUBST(X11_EXTRA_DEPS) 29- 30-# Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro 31-# was not expanded, since libX11 with no transport types is rather useless. 32-# 33-# If you're seeing an error here, be sure you installed the lib/xtrans module 34-# first and if it's not in the default location, that you set the ACLOCAL 35-# environment variable to find it, such as: 36-# ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" 37-m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) 38- 39-# Transport selection macro from xtrans.m4 40-XTRANS_CONNECTION_FLAGS 41- 42 # Check for dlopen 43 AC_MSG_CHECKING([if run-time linking is supported]) 44 AC_SEARCH_LIBS(dlopen,[dl svld]) 45@@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS) 46 47 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) 48 49-# 50-# Find keysymdef.h 51-# 52-AC_MSG_CHECKING([keysym definitions]) 53-AC_ARG_WITH([keysymdefdir], 54- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], 55- [KEYSYMDEFDIR=$withval], 56- [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) 57- 58-if test ! -d "$KEYSYMDEFDIR"; then 59- AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) 60-fi 61- 62-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" 63-for i in $FILES; do 64- if test -f "$KEYSYMDEFDIR/$i"; then 65- KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" 66- elif test "x$i" = "xkeysymdef.h"; then 67- AC_MSG_ERROR([Cannot find keysymdef.h]) 68- fi 69-done 70-AC_MSG_RESULT([$KEYSYMDEFS]) 71-AC_SUBST(KEYSYMDEFS) 72- 73 AC_ARG_ENABLE(xcms, 74 AS_HELP_STRING([--disable-xcms], 75 [Disable Xlib support for CMS *EXPERIMENTAL*]), 76@@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11" 77 AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) 78 AC_SUBST(X11_LIBDIR) 79 80-PKG_CHECK_MODULES(X11, [$X11_REQUIRES]) 81 X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS" 82 83 # 84-- 852.7.4 86 87