diff options
author | Richard Purdie <richard@openedhand.com> | 2008-01-16 17:30:58 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-01-16 17:30:58 +0000 |
commit | c07279279b0ff34f22983d272e19f8e3a2ab89cd (patch) | |
tree | 24e4830015215b79b323b07f380c128382ced2e2 /meta/packages/xorg-lib/libx11/include_fix.patch | |
parent | ae52d011b268888af60bc14def6b5bc25230b350 (diff) | |
download | poky-c07279279b0ff34f22983d272e19f8e3a2ab89cd.tar.gz |
libx11: Fixup libx11-native (fix typos, add missing patches, cleanup -native version)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3499 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib/libx11/include_fix.patch')
-rw-r--r-- | meta/packages/xorg-lib/libx11/include_fix.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/libx11/include_fix.patch b/meta/packages/xorg-lib/libx11/include_fix.patch new file mode 100644 index 0000000000..565308834e --- /dev/null +++ b/meta/packages/xorg-lib/libx11/include_fix.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | --- | ||
2 | configure.ac | 44 ++++++++++++++++++++++++-------------------- | ||
3 | 1 file changed, 24 insertions(+), 20 deletions(-) | ||
4 | |||
5 | Index: libX11-1.1.2/configure.ac | ||
6 | =================================================================== | ||
7 | --- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000 | ||
8 | +++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000 | ||
9 | @@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, | ||
10 | # | ||
11 | KEYSYMDEF="" | ||
12 | AC_MSG_CHECKING([keysymdef.h]) | ||
13 | -for flag in $XPROTO_CFLAGS -I/usr/include; do | ||
14 | - case "$KEYSYMDEF" in | ||
15 | - "") | ||
16 | - case "$flag" in | ||
17 | - *-I*) | ||
18 | - dir=`echo "$flag" | sed 's/ *-I//'` | ||
19 | - file="$dir/X11/keysymdef.h" | ||
20 | - if test -f "$file"; then | ||
21 | - KEYSYMDEF="$file" | ||
22 | - fi | ||
23 | +AC_ARG_WITH(keysymdef, | ||
24 | + AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), | ||
25 | + KEYSYMDEF=$withval, KEYSYMDEF="") | ||
26 | + | ||
27 | +if test x$KEYSYMDEF = x; then | ||
28 | + for flag in $XPROTO_CFLAGS -I/usr/include; do | ||
29 | + case "$KEYSYMDEF" in | ||
30 | + "") | ||
31 | + case "$flag" in | ||
32 | + *-I*) | ||
33 | + dir=`echo "$flag" | sed 's/ *-I//'` | ||
34 | + file="$dir/X11/keysymdef.h" | ||
35 | + if test -f "$file"; then | ||
36 | + KEYSYMDEF="$file" | ||
37 | + fi | ||
38 | + ;; | ||
39 | + esac | ||
40 | ;; | ||
41 | esac | ||
42 | - ;; | ||
43 | - esac | ||
44 | -done | ||
45 | -case "$KEYSYMDEF" in | ||
46 | -"") | ||
47 | - AC_MSG_ERROR([Cannot find keysymdef.h]) | ||
48 | - ;; | ||
49 | -*) | ||
50 | + done | ||
51 | +fi | ||
52 | + | ||
53 | +if test -f "$KEYSYMDEF"; then | ||
54 | AC_MSG_RESULT([$KEYSYMDEF]) | ||
55 | - ;; | ||
56 | -esac | ||
57 | +else | ||
58 | + AC_MSG_ERROR([Cannot find keysymdef.h]) | ||
59 | +fi | ||
60 | AC_SUBST(KEYSYMDEF) | ||
61 | |||
62 | AC_ARG_ENABLE(udc, | ||