diff options
-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 @@ | |||
1 | 20120519 | 1 | 20120519 |
2 | - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch | 2 | - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch |
3 | from cjwatson at debian org. | 3 | from cjwatson at debian org. |
4 | - (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to find | ||
5 | pkg-config so it does the right thing when cross-compiling. Patch from | ||
6 | cjwatson at debian org. | ||
4 | 7 | ||
5 | 20120504 | 8 | 20120504 |
6 | - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> | 9 | - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> |
diff --git a/configure.ac b/configure.ac index bdf1d12c9..02f8bf858 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.491 2012/05/19 04:25:42 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.492 2012/05/19 05:24:37 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.491 $) | 18 | AC_REVISION($Revision: 1.492 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -1410,7 +1410,7 @@ AC_ARG_WITH([libedit], | |||
1410 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], | 1410 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], |
1411 | [ if test "x$withval" != "xno" ; then | 1411 | [ if test "x$withval" != "xno" ; then |
1412 | if test "x$withval" = "xyes" ; then | 1412 | if test "x$withval" = "xyes" ; then |
1413 | AC_PATH_PROG([PKGCONFIG], [pkg-config], [no]) | 1413 | AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no]) |
1414 | if test "x$PKGCONFIG" != "xno"; then | 1414 | if test "x$PKGCONFIG" != "xno"; then |
1415 | AC_MSG_CHECKING([if $PKGCONFIG knows about libedit]) | 1415 | AC_MSG_CHECKING([if $PKGCONFIG knows about libedit]) |
1416 | if "$PKGCONFIG" libedit; then | 1416 | if "$PKGCONFIG" libedit; then |
diff --git a/contrib/Makefile b/contrib/Makefile index 8b34eb221..c6c48e78a 100644 --- a/contrib/Makefile +++ b/contrib/Makefile | |||
@@ -1,3 +1,5 @@ | |||
1 | PKG_CONFIG = pkg-config | ||
2 | |||
1 | all: | 3 | all: |
2 | @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" | 4 | @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" |
3 | 5 | ||
@@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c | |||
7 | `gnome-config --libs gnome gnomeui` | 9 | `gnome-config --libs gnome gnomeui` |
8 | 10 | ||
9 | gnome-ssh-askpass2: gnome-ssh-askpass2.c | 11 | gnome-ssh-askpass2: gnome-ssh-askpass2.c |
10 | $(CC) `pkg-config --cflags gtk+-2.0` \ | 12 | $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \ |
11 | gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ | 13 | gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ |
12 | `pkg-config --libs gtk+-2.0 x11` | 14 | `$(PKG_CONFIG) --libs gtk+-2.0 x11` |
13 | 15 | ||
14 | clean: | 16 | clean: |
15 | rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass | 17 | rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass |