RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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.
This commit is contained in:
Darren Tucker 2012-05-19 15:24:37 +10:00
parent d0494fdb29
commit 593538911a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
20120519 20120519
- (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
from cjwatson at debian org. 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 20120504
- (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>

6
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.491 2012/05/19 04:25:42 dtucker Exp $ # $Id: configure.ac,v 1.492 2012/05/19 05:24:37 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.491 $) AC_REVISION($Revision: 1.492 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -1410,7 +1410,7 @@ AC_ARG_WITH([libedit],
[ --with-libedit[[=PATH]] Enable libedit support for sftp], [ --with-libedit[[=PATH]] Enable libedit support for sftp],
[ if test "x$withval" != "xno" ; then [ if test "x$withval" != "xno" ; then
if test "x$withval" = "xyes" ; 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 if test "x$PKGCONFIG" != "xno"; then
AC_MSG_CHECKING([if $PKGCONFIG knows about libedit]) AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
if "$PKGCONFIG" libedit; then if "$PKGCONFIG" libedit; then

6
contrib/Makefile
View File

@ -1,3 +1,5 @@
PKG_CONFIG = pkg-config
all: all:
@echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" @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-config --libs gnome gnomeui`
gnome-ssh-askpass2: gnome-ssh-askpass2.c 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 \ gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
`pkg-config --libs gtk+-2.0 x11` `$(PKG_CONFIG) --libs gtk+-2.0 x11`
clean: clean:
rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass