diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 15:25:03 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2012-05-19 15:25:03 +1000 |
| commit | f8eb9c95fc25066ac8ccf62b8f8d1f9f64babbda (patch) | |
| tree | 54e0d17c414fe873414cda0850fc419ea0b29174 | |
| parent | 6d9e1decdb9d3b571c5c542220ed780dda0d03ef (diff) | |
- (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to findV_6_0
pkg-config so it does the right thing when cross-compiling. Patch from
cjwatson at debian org.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | contrib/Makefile | 6 |
3 files changed, 10 insertions, 5 deletions
@@ -1,6 +1,9 @@ 20120519 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch from cjwatson at debian org. + - (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to find + pkg-config so it does the right thing when cross-compiling. Patch from + cjwatson at debian org. 20120504 - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> diff --git a/configure.ac b/configure.ac index 6be17b89..6d38864c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.489.2.2 2012/05/19 04:26:11 dtucker Exp $ +# $Id: configure.ac,v 1.489.2.3 2012/05/19 05:25:04 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.489.2.2 $) +AC_REVISION($Revision: 1.489.2.3 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -1410,7 +1410,7 @@ AC_ARG_WITH([libedit], [ --with-libedit[[=PATH]] Enable libedit support for sftp], [ if test "x$withval" != "xno" ; then if test "x$withval" = "xyes" ; then - AC_PATH_PROG([PKGCONFIG], [pkg-config], [no]) + AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no]) if test "x$PKGCONFIG" != "xno"; then AC_MSG_CHECKING([if $PKGCONFIG knows about libedit]) if "$PKGCONFIG" libedit; then diff --git a/contrib/Makefile b/contrib/Makefile index 8b34eb22..c6c48e78 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,3 +1,5 @@ +PKG_CONFIG = pkg-config + all: @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" @@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c `gnome-config --libs gnome gnomeui` gnome-ssh-askpass2: gnome-ssh-askpass2.c - $(CC) `pkg-config --cflags gtk+-2.0` \ + $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \ gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ - `pkg-config --libs gtk+-2.0 x11` + `$(PKG_CONFIG) --libs gtk+-2.0 x11` clean: rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass |