diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-05-24 09:38:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-06 15:58:39 +0100 |
commit | d0c2307bca5e98c7ff7bbef9867cebce7b8aeafa (patch) | |
tree | 08e62d30eca23d0bde1da736aa5ee4760fa3235b /meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch | |
parent | 5d359880f000700a7305d1b4548707652df6388e (diff) | |
download | poky-d0c2307bca5e98c7ff7bbef9867cebce7b8aeafa.tar.gz |
autoconf: upgrade from 2.65 to 2.68
And rebase the patches to the newer code.
(From OE-Core rev: aa24c1eda4b33b329d330c8bbb6d243dfd924f62)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch')
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch new file mode 100644 index 0000000000..6ebef0a540 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: lib/autoconf/libs.m4 | ||
4 | =================================================================== | ||
5 | RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v | ||
6 | retrieving revision 1.13 | ||
7 | diff -p -u -r1.13 libs.m4 | ||
8 | --- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 | ||
9 | +++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 | ||
10 | @@ -265,13 +265,13 @@ ac_x_header_dirs=' | ||
11 | /usr/openwin/share/include' | ||
12 | |||
13 | if test "$ac_x_includes" = no; then | ||
14 | - # Guess where to find include files, by looking for Intrinsic.h. | ||
15 | + # Guess where to find include files, by looking for Xlib.h. | ||
16 | # First, try using that file with no special directory specified. | ||
17 | - AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], | ||
18 | + AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])], | ||
19 | [# We can compile using X headers with no special include directory. | ||
20 | ac_x_includes=], | ||
21 | [for ac_dir in $ac_x_header_dirs; do | ||
22 | - if test -r "$ac_dir/X11/Intrinsic.h"; then | ||
23 | + if test -r "$ac_dir/X11/Xlib.h"; then | ||
24 | ac_x_includes=$ac_dir | ||
25 | break | ||
26 | fi | ||
27 | @@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then | ||
28 | # Don't add to $LIBS permanently. | ||
29 | ac_save_LIBS=$LIBS | ||
30 | - LIBS="-lXt $LIBS" | ||
31 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], | ||
32 | - [XtMalloc (0)])], | ||
33 | + LIBS="-lX11 $LIBS" | ||
34 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>], | ||
35 | + [XrmInitialize ()])], | ||
36 | [LIBS=$ac_save_LIBS | ||
37 | # We can link X programs with no special library path. | ||
38 | ac_x_libraries=], | ||