diff options
-rw-r--r-- | Makefile.in | 9 | ||||
-rw-r--r-- | configure.in | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 03200eb9d..a342c9a32 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -11,7 +11,8 @@ ASKPASS_PROGRAM=@libdir@/ssh/ssh-askpass | |||
11 | CC=@CC@ | 11 | CC=@CC@ |
12 | PATHS=-DETCDIR=\"@sysconfdir@\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\" | 12 | PATHS=-DETCDIR=\"@sysconfdir@\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\" |
13 | CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ | 13 | CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ |
14 | TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp | 14 | EXTRA_TARGETS=@GNOME_ASKPASS@ |
15 | TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) | ||
15 | LIBS=@LIBS@ | 16 | LIBS=@LIBS@ |
16 | AR=@AR@ | 17 | AR=@AR@ |
17 | RANLIB=@RANLIB@ | 18 | RANLIB=@RANLIB@ |
@@ -68,7 +69,11 @@ install: | |||
68 | ln -sf ssh $(bindir)/slogin | 69 | ln -sf ssh $(bindir)/slogin |
69 | install -s -c scp $(bindir)/scp | 70 | install -s -c scp $(bindir)/scp |
70 | install -s -c ssh-add $(bindir)/ssh-add | 71 | install -s -c ssh-add $(bindir)/ssh-add |
71 | install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass | 72 | if [ -z "@GNOME_ASKPASS@"] ; then |
73 | install -m755 -c ssh-askpass $(libdir)/ssh/ssh-askpass | ||
74 | else | ||
75 | install -m755 -c gnome-ssh-askpass $(libdir)/ssh/ssh-askpass | ||
76 | fi | ||
72 | install -s -c ssh-agent $(bindir)/ssh-agent | 77 | install -s -c ssh-agent $(bindir)/ssh-agent |
73 | install -s -c ssh-keygen $(bindir)/ssh-keygen | 78 | install -s -c ssh-keygen $(bindir)/ssh-keygen |
74 | install -s -c sshd $(sbindir)/sshd | 79 | install -s -c sshd $(sbindir)/sshd |
diff --git a/configure.in b/configure.in index a03c2af2c..fc59cbb8b 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,5 @@ | |||
1 | dnl Process this file with autoconf to produce a configure script. | 1 | dnl Process this file with autoconf to produce a configure script. |
2 | |||
2 | AC_INIT(auth-krb4.c) | 3 | AC_INIT(auth-krb4.c) |
3 | 4 | ||
4 | AC_CONFIG_HEADER(config.h) | 5 | AC_CONFIG_HEADER(config.h) |
@@ -63,4 +64,10 @@ dnl Checks for library functions. | |||
63 | AC_PROG_GCC_TRADITIONAL | 64 | AC_PROG_GCC_TRADITIONAL |
64 | AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle) | 65 | AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle) |
65 | 66 | ||
67 | dnl Check whether user wants GNOME ssh-askpass | ||
68 | AC_ARG_WITH(gnome-askpass, | ||
69 | [ --with-gnome-askpass Build and use the GNOME passphrase requester], | ||
70 | [GNOME_ASKPASS="gnome-ssh-askpass"]) | ||
71 | AC_SUBST(GNOME_ASKPASS) | ||
72 | |||
66 | AC_OUTPUT(Makefile) | 73 | AC_OUTPUT(Makefile) |