37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
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=],
|