diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 21:57:53 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 21:57:53 +1100 |
commit | 6c21c51c487ec31ceb5b81b536c9516c5f20b5b0 (patch) | |
tree | e5fba473079d684039e0d6b2f0bd393b3e1b0186 /Makefile.in | |
parent | 7b10ef48771bc3649b6e5ea0b021a2270a5d62f8 (diff) |
- (djm) autoconf hacking:
- We don't support --without-zlib currently, so don't allow it.
- Rework cryptographic random number support detection. We now detect
whether OpenSSL seeds itself. If it does, then we don't bother with
the ssh-rand-helper program. You can force the use of ssh-rand-helper
using the --with-rand-helper configure argument
- Simplify and clean up ssh-rand-helper configuration
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 287b5ab1b..58bf424b5 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.192 2001/12/25 04:32:58 stevesk Exp $ | 1 | # $Id: Makefile.in,v 1.193 2002/01/22 10:57:54 djm Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -42,6 +42,7 @@ EXEEXT=@EXEEXT@ | |||
42 | SSH_MODE= @SSHMODE@ | 42 | SSH_MODE= @SSHMODE@ |
43 | 43 | ||
44 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 44 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
45 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | ||
45 | 46 | ||
46 | @NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT) | 47 | @NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT) |
47 | 48 | ||
@@ -201,7 +202,9 @@ install-files: scard-install | |||
201 | $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen | 202 | $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen |
202 | $(INSTALL) -m 0755 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan | 203 | $(INSTALL) -m 0755 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan |
203 | $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd | 204 | $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd |
204 | $(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper | 205 | if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \ |
206 | $(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \ | ||
207 | fi | ||
205 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp | 208 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp |
206 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER) | 209 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER) |
207 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 210 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |