diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-21 11:18:00 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-21 11:18:00 +0000 |
commit | eabaa88ffbd6d0125d31c629534614f3ede92b43 (patch) | |
tree | ebb3845832061ec8e9bc757133e780e058516c9c /packages/autoconf/autoconf-2.61/autoconf-x.patch | |
parent | 373c52d20c06479a59091293dbeb1cc22ed74dc4 (diff) | |
parent | 5a1269e53c80708c3e3f53569791c66eab0cae12 (diff) |
merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'
and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'
Diffstat (limited to 'packages/autoconf/autoconf-2.61/autoconf-x.patch')
-rw-r--r-- | packages/autoconf/autoconf-2.61/autoconf-x.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/packages/autoconf/autoconf-2.61/autoconf-x.patch b/packages/autoconf/autoconf-2.61/autoconf-x.patch new file mode 100644 index 0000000000..596535b7d6 --- /dev/null +++ b/packages/autoconf/autoconf-2.61/autoconf-x.patch @@ -0,0 +1,36 @@ +Index: lib/autoconf/libs.m4 +=================================================================== +RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v +retrieving revision 1.13 +diff -p -u -r1.13 libs.m4 +--- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 ++++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 +@@ -265,13 +265,13 @@ ac_x_header_dirs=' + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], ++ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])], + [# We can compile using X headers with no special include directory. + ac_x_includes=], + [for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], +- [XtMalloc (0)])], ++ LIBS="-lX11 $LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>], ++ [XrmInitialize ()])], + [LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries=], |