- (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using

   pkg-config, patch from Colin Watson.  Needed for newer linkers (ie gold).

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f217bd831..0243ef42f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
    Coker via Colin watson; bz#1726 ok dtucker@
  - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
    ok dtucker@
+ - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using
+   pkg-config, patch from Colin Watson.  Needed for newer linkers (ie gold).
 
 20100324
  - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory
diff --git a/contrib/Makefile b/contrib/Makefile
index 2cef46f6c..8b34eb221 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -9,7 +9,7 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
 gnome-ssh-askpass2: gnome-ssh-askpass2.c
         $(CC) `pkg-config --cflags gtk+-2.0` \
                 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
-                `pkg-config --libs gtk+-2.0`
+                `pkg-config --libs gtk+-2.0 x11`
 
 clean:
         rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass