1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu, 15 Nov 2018 11:02:09 +0100
Subject: [PATCH] HACK: disable stuff not needed for locale data
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configure.ac | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index a5fd706f4a3c..65433c677f6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,30 +237,6 @@ AC_SUBST(XTHREAD_CFLAGS)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
-#
-# Find keysymdef.h
-#
-AC_MSG_CHECKING([keysym definitions])
-AC_ARG_WITH([keysymdefdir],
- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
- [KEYSYMDEFDIR=$withval],
- [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
-
-if test ! -d "$KEYSYMDEFDIR"; then
- AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
-fi
-
-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
-for i in $FILES; do
- if test -f "$KEYSYMDEFDIR/$i"; then
- KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
- elif test "x$i" = "xkeysymdef.h"; then
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
-done
-AC_MSG_RESULT([$KEYSYMDEFS])
-AC_SUBST(KEYSYMDEFS)
-
AC_ARG_ENABLE(xcms,
AS_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
@@ -340,9 +316,6 @@ X11_LIBDIR="${libdir}/X11"
AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
-PKG_CHECK_MODULES(X11, [$X11_REQUIRES])
-X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS"
-
#
# Yes, it would be nice to put the locale data in
# /usr/share, but the locale stuff includes loadable
|
