* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Use -lX11, not

  -lXt in LIBS, idea from Karsten Hopp.

diff --git a/ChangeLog b/ChangeLog
index 77f7de1ce0b6c26c6537f9fbe6210e8b504b8bb5..03b15dab0b58fc18d5f67349fa38e13daeb6029c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-26  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Use -lX11, not
+       -lXt in LIBS, idea from Karsten Hopp; this was due since
+       this change:
+
+       2005-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+       * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Look for X11/Xlib.h
+       and XrmInitialize rather than X11/Intrinsic.h and XtMalloc
+       (which belong to Xt, not X itself).  See Debian bug 327655.
+
 2006-06-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure.ac (AC_INIT): Bump to 2.60a.

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 2964b27fbb1a9516b206c85f8a6264fd055b4daa..773aa65a41a509e118e188317a1b2932d316e4ec 100644 (file)
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -288,7 +288,7 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
                                  [XrmInitialize ()])],
                 [LIBS=$ac_save_LIBS