From 860cd79efd195b069cc2fbdee3b5b945c4798e26 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 20 Jul 2011 17:50:02 +0000 Subject: [PATCH] When we check for libX11 in the autoconf script, add it to $GTK_LIBS on success rather than to $LIBS, because it's only used in the GUI tools and we don't want the command-line tools linked against it. [originally from svn r9238] --- unix/configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unix/configure.ac b/unix/configure.ac index 12329172..bd40373e 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -92,7 +92,9 @@ AS_IF([test "x$with_gssapi" != xno], [], [AC_DEFINE([NO_GSSAPI_LIB], [1], [Define if we could not find a gssapi library])])])]) -AC_CHECK_LIB(X11, XOpenDisplay) +AC_CHECK_LIB(X11, XOpenDisplay, + [GTK_LIBS="-lX11 $GTK_LIBS" + AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])]) AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])