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