diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-03-26 11:16:39 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-03-26 11:16:39 +1100 |
commit | ffd1eaadb0b97c1f172ed0ec9eda51fd368617ae (patch) | |
tree | 28f443e1804a156c07ea6ce2356f21aedebe50c8 | |
parent | 6480c63b759eb8add9387220fd8ed630e0563316 (diff) |
- (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using
pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold).
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | contrib/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -13,6 +13,8 @@ | |||
13 | Coker via Colin watson; bz#1726 ok dtucker@ | 13 | Coker via Colin watson; bz#1726 ok dtucker@ |
14 | - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 | 14 | - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 |
15 | ok dtucker@ | 15 | ok dtucker@ |
16 | - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using | ||
17 | pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). | ||
16 | 18 | ||
17 | 20100324 | 19 | 20100324 |
18 | - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory | 20 | - (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 | |||
9 | gnome-ssh-askpass2: gnome-ssh-askpass2.c | 9 | gnome-ssh-askpass2: gnome-ssh-askpass2.c |
10 | $(CC) `pkg-config --cflags gtk+-2.0` \ | 10 | $(CC) `pkg-config --cflags gtk+-2.0` \ |
11 | gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ | 11 | gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ |
12 | `pkg-config --libs gtk+-2.0` | 12 | `pkg-config --libs gtk+-2.0 x11` |
13 | 13 | ||
14 | clean: | 14 | clean: |
15 | rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass | 15 | rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass |