summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-29 20:12:39 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-29 20:12:39 +0000
commit6de25dd7c2eb4c0023b24f937d0a66a525c580a2 (patch)
treee040a7ee852468a3f2cd156d6d7e83aac2cb9bc2
parent18b5ccc2175fce8c3a4217bdf0a1b892f7d3b4ae (diff)
downloadpoky-6de25dd7c2eb4c0023b24f937d0a66a525c580a2.tar.gz
libx11: Update include_fix.patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5326 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xorg-lib/libx11/include_fix.patch77
1 files changed, 19 insertions, 58 deletions
diff --git a/meta/packages/xorg-lib/libx11/include_fix.patch b/meta/packages/xorg-lib/libx11/include_fix.patch
index 565308834e..99ed57194e 100644
--- a/meta/packages/xorg-lib/libx11/include_fix.patch
+++ b/meta/packages/xorg-lib/libx11/include_fix.patch
@@ -1,62 +1,23 @@
1--- 1---
2 configure.ac | 44 ++++++++++++++++++++++++-------------------- 2 configure.ac | 6 +++---
3 1 file changed, 24 insertions(+), 20 deletions(-) 3 1 file changed, 3 insertions(+), 3 deletions(-)
4 4
5Index: libX11-1.1.2/configure.ac 5--- libX11-1.1.5.orig/configure.ac
6=================================================================== 6+++ libX11-1.1.5/configure.ac
7--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000 7@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
8+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000 8 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
9@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 9
10 #
11 # Find keysymdef.h
10 # 12 #
11 KEYSYMDEF="" 13-AC_MSG_CHECKING([keysymdef.h])
12 AC_MSG_CHECKING([keysymdef.h]) 14-dir=`pkg-config --variable=includedir xproto`
13-for flag in $XPROTO_CFLAGS -I/usr/include; do 15-KEYSYMDEF="$dir/X11/keysymdef.h"
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, 16+AC_ARG_WITH(keysymdef,
24+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), 17+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
25+ KEYSYMDEF=$withval, KEYSYMDEF="") 18+ KEYSYMDEF=$withval, KEYSYMDEF="")
26+ 19 if test -f "$KEYSYMDEF"; then
27+if test x$KEYSYMDEF = x; then 20 AC_MSG_RESULT([$KEYSYMDEF])
28+ for flag in $XPROTO_CFLAGS -I/usr/include; do 21 else
29+ case "$KEYSYMDEF" in 22 AC_MSG_ERROR([Cannot find keysymdef.h])
30+ "") 23 fi
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,