Colin Watson reports that linking with 'gold' doesn't work, because

PuTTY makes explicit use of libX11 without including -lX11 on the
link line. (GNU ld appears to pull in libX11 automatically because
it's needed for the dependencies of GTK, but gold expects that
dependency to be satisfied at run time via DT_NEEDED and hence
doesn't bother.) Hence, add explicit -lX11 to both Makefile.gtk and
the autoconf world.

git-svn-id: svn://svn.tartarus.org/sgt/putty@8876 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mkfiles.pl b/mkfiles.pl
index 9466ffe..8155c90 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -928,10 +928,10 @@ if (defined $makefiles{'gtk'}) {
     "KRB5CONFIG=krb5-config\n".
     "# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n".
     "# (depending on what works on your system) if you want to enforce\n".
-    "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n".
+    "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0 x11'\n".
     "# if you want to enforce 2.0. The default is to try 2.0 and fall back\n".
     "# to 1.2 if it isn't found.\n".
-    "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
+    "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 x11 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
     "\n".
     "-include Makefile.local\n".
     "\n".

diff --git a/unix/configure.ac b/unix/configure.ac
index dcbc153..d84d61e 100644 (file)
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -51,6 +51,8 @@ if test "$with_gssapi" != "no"; then
   AC_SEARCH_LIBS([gss_init_sec_context], [gssapi gssapi_krb5 gss])
 fi
 
+AC_CHECK_LIB(X11, XOpenDisplay)
+
 AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
 
 AC_OUTPUT