View | Details | Raw Unified | Return to bug 1996
Collapse All | Expand All

(-)configure.ac (-1 / +1 lines)
Lines 1361-1367 AC_ARG_WITH([libedit], Link Here
1361
	[  --with-libedit[[=PATH]]   Enable libedit support for sftp],
1361
	[  --with-libedit[[=PATH]]   Enable libedit support for sftp],
1362
	[ if test "x$withval" != "xno" ; then
1362
	[ if test "x$withval" != "xno" ; then
1363
		if test "x$withval" = "xyes" ; then
1363
		if test "x$withval" = "xyes" ; then
1364
			AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
1364
			AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
1365
			if test "x$PKGCONFIG" != "xno"; then
1365
			if test "x$PKGCONFIG" != "xno"; then
1366
				AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
1366
				AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
1367
			 	if "$PKGCONFIG" libedit; then
1367
			 	if "$PKGCONFIG" libedit; then
(-)contrib/Makefile (-2 / +4 lines)
Lines 1-3 Link Here
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
Lines 7-15 gnome-ssh-askpass1: gnome-ssh-askpass1.c Link Here
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

Return to bug 1996