summaryrefslogtreecommitdiff
path: root/meta
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 /meta
parent18b5ccc2175fce8c3a4217bdf0a1b892f7d3b4ae (diff)
downloadopenembedded-core-6de25dd7c2eb4c0023b24f937d0a66a525c580a2.tar.gz
openembedded-core-6de25dd7c2eb4c0023b24f937d0a66a525c580a2.tar.bz2
openembedded-core-6de25dd7c2eb4c0023b24f937d0a66a525c580a2.tar.xz
openembedded-core-6de25dd7c2eb4c0023b24f937d0a66a525c580a2.zip
libx11: Update include_fix.patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5326 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-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 565308834..99ed57194 100644
--- a/meta/packages/xorg-lib/libx11/include_fix.patch
+++ b/meta/packages/xorg-lib/libx11/include_fix.patch
@@ -1,62 +1,23 @@
---
- configure.ac | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
-Index: libX11-1.1.2/configure.ac
-===================================================================
---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000
-+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000
-@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+--- libX11-1.1.5.orig/configure.ac
++++ libX11-1.1.5/configure.ac
+@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+
+ #
+ # Find keysymdef.h
#
- KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
+-AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
-+
-+if test x$KEYSYMDEF = x; then
-+ for flag in $XPROTO_CFLAGS -I/usr/include; do
-+ case "$KEYSYMDEF" in
-+ "")
-+ case "$flag" in
-+ *-I*)
-+ dir=`echo "$flag" | sed 's/ *-I//'`
-+ file="$dir/X11/keysymdef.h"
-+ if test -f "$file"; then
-+ KEYSYMDEF="$file"
-+ fi
-+ ;;
-+ esac
- ;;
- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+ done
-+fi
-+
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AC_ARG_ENABLE(udc,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi