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