diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-05 13:48:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-05 13:48:37 +1000 |
commit | f22019bdbfb986daf24428a9d37f9fe9bb3ff7ad (patch) | |
tree | e23aa2864fccb6f4097d962aa14f9d78ca02a929 /aclocal.m4 | |
parent | 68790fedef210e03e36534b111e2f27b858170b4 (diff) |
- (djm) [Makefile.in WARNING.RNG aclocal.m4 buildpkg.sh.in configure.ac]
[entropy.c ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c]
[ssh-keysign.c ssh-pkcs11-helper.c ssh-rand-helper.8 ssh-rand-helper.c]
[ssh.c ssh_prng_cmds.in sshd.c contrib/aix/buildbff.sh]
[regress/README.regress] Remove ssh-rand-helper and all its
tentacles. PRNGd seeding has been rolled into entropy.c directly.
Thanks to tim@ for testing on affected platforms.
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index b68a47080..83b241f7b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 | |||
@@ -1,4 +1,4 @@ | |||
1 | dnl $Id: aclocal.m4,v 1.6 2005/09/19 16:33:39 tim Exp $ | 1 | dnl $Id: aclocal.m4,v 1.7 2011/05/05 03:48:37 djm Exp $ |
2 | dnl | 2 | dnl |
3 | dnl OpenSSH-specific autoconf macros | 3 | dnl OpenSSH-specific autoconf macros |
4 | dnl | 4 | dnl |
@@ -33,16 +33,6 @@ AC_DEFUN(OSSH_CHECK_HEADER_FOR_FIELD, [ | |||
33 | fi | 33 | fi |
34 | ]) | 34 | ]) |
35 | 35 | ||
36 | dnl OSSH_PATH_ENTROPY_PROG(variablename, command): | ||
37 | dnl Tidiness function, sets 'undef' if not found, and does the AC_SUBST | ||
38 | AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [ | ||
39 | AC_PATH_PROG($1, $2) | ||
40 | if test -z "[$]$1" ; then | ||
41 | $1="undef" | ||
42 | fi | ||
43 | AC_SUBST($1) | ||
44 | ]) | ||
45 | |||
46 | dnl Check for socklen_t: historically on BSD it is an int, and in | 36 | dnl Check for socklen_t: historically on BSD it is an int, and in |
47 | dnl POSIX 1g it is a type of its own, but some platforms use different | 37 | dnl POSIX 1g it is a type of its own, but some platforms use different |
48 | dnl types for the argument to getsockopt, getpeername, etc. So we | 38 | dnl types for the argument to getsockopt, getpeername, etc. So we |