]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/autoconf/autoconf-2.59/autoconf-x.patch
remaining build fixes for dbus 0.94 update.
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / autoconf / autoconf-2.59 / autoconf-x.patch
1 Index: lib/autoconf/libs.m4
2 ===================================================================
3 RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v
4 retrieving revision 1.13
5 diff -p -u -r1.13 libs.m4
6 --- autoconf-2.59/lib/autoconf/libs.m4  6 Sep 2005 15:34:06 -0000       1.13
7 +++ autoconf-2.59/lib/autoconf/libs.m4  18 Sep 2005 17:09:58 -0000
8 @@ -265,13 +265,13 @@ ac_x_header_dirs='
9  /usr/openwin/share/include'
10  
11  if test "$ac_x_includes" = no; then
12 -  # Guess where to find include files, by looking for Intrinsic.h.
13 +  # Guess where to find include files, by looking for Xlib.h.
14    # First, try using that file with no special directory specified.
15 -  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
16 +  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
17  [# We can compile using X headers with no special include directory.
18  ac_x_includes=],
19  [for ac_dir in $ac_x_header_dirs; do
20 -  if test -r "$ac_dir/X11/Intrinsic.h"; then
21 +  if test -r "$ac_dir/X11/Xlib.h"; then
22      ac_x_includes=$ac_dir
23      break
24    fi
25 @@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then
26    # Don't add to $LIBS permanently.
27    ac_save_LIBS=$LIBS
28 -  LIBS="-lXt $LIBS"
29 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
30 -                                 [XtMalloc (0)])],
31 +  LIBS="-lX11 $LIBS"
32 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
33 +                                 [XrmInitialize ()])],
34                  [LIBS=$ac_save_LIBS
35  # We can link X programs with no special library path.
36  ac_x_libraries=],