summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-02 09:56:41 +1000
committerDamien Miller <djm@mindrot.org>2000-05-02 09:56:41 +1000
commit0437b33e54fd72060d17908d6abf96bfabaacad2 (patch)
treef4fe0e394d30b915b5647c8c6d48c86b43337c96 /configure.in
parent6f83b8e34d3dc8227d7cf39989c5966abde2305e (diff)
- Add Andre Lucas' <andre.lucas@dial.pipex.com> patch to read entropy
gathering commands from a text file
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in83
1 files changed, 25 insertions, 58 deletions
diff --git a/configure.in b/configure.in
index 8046fa3e1..be2a63df1 100644
--- a/configure.in
+++ b/configure.in
@@ -637,66 +637,31 @@ AC_ARG_WITH(egd-pool,
637 ] 637 ]
638) 638)
639 639
640# detect pathnames for entropy gathering commands, if we need them
641INSTALL_SSH_PRNG_CMDS=""
642rm -f prng_commands
640if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then 643if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then
641 # Use these commands to collect entropy 644 # Use these commands to collect entropy
642 AC_PATH_PROG(PROG_LS, ls) 645 AC_PATH_ENTROPY_PROG(PROG_LS, ls)
643 AC_PATH_PROG(PROG_NETSTAT, netstat) 646 AC_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
644 AC_PATH_PROG(PROG_ARP, arp) 647 AC_PATH_ENTROPY_PROG(PROG_ARP, arp)
645 AC_PATH_PROG(PROG_IFCONFIG, ifconfig) 648 AC_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig)
646 AC_PATH_PROG(PROG_PS, ps) 649 AC_PATH_ENTROPY_PROG(PROG_PS, ps)
647 AC_PATH_PROG(PROG_W, w) 650 AC_PATH_ENTROPY_PROG(PROG_W, w)
648 AC_PATH_PROG(PROG_WHO, who) 651 AC_PATH_ENTROPY_PROG(PROG_WHO, who)
649 AC_PATH_PROG(PROG_LAST, last) 652 AC_PATH_ENTROPY_PROG(PROG_LAST, last)
650 AC_PATH_PROG(PROG_LASTLOG, lastlog) 653 AC_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog)
651 AC_PATH_PROG(PROG_DF, df) 654 AC_PATH_ENTROPY_PROG(PROG_DF, df)
652 AC_PATH_PROG(PROG_VMSTAT, vmstat) 655 AC_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat)
653 AC_PATH_PROG(PROG_UPTIME, uptime) 656 AC_PATH_ENTROPY_PROG(PROG_UPTIME, uptime)
654 AC_PATH_PROG(PROG_IPCS, ipcs) 657 AC_PATH_ENTROPY_PROG(PROG_IPCS, ipcs)
655 AC_PATH_PROG(PROG_TAIL, tail) 658 AC_PATH_ENTROPY_PROG(PROG_TAIL, tail)
656 AC_PATH_PROG(PROG_LS, ls) 659 AC_PATH_ENTROPY_PROG(PROG_LS, ls)
657 if test ! -z "$PROG_LS" ; then 660
658 AC_DEFINE_UNQUOTED(PROG_LS, "$PROG_LS") 661 INSTALL_SSH_PRNG_CMDS="yes"
659 fi
660 if test ! -z "$PROG_NETSTAT" ; then
661 AC_DEFINE_UNQUOTED(PROG_NETSTAT, "$PROG_NETSTAT")
662 fi
663 if test ! -z "$PROG_ARP" ; then
664 AC_DEFINE_UNQUOTED(PROG_ARP, "$PROG_ARP")
665 fi
666 if test ! -z "$PROG_IFCONFIG" ; then
667 AC_DEFINE_UNQUOTED(PROG_IFCONFIG, "$PROG_IFCONFIG")
668 fi
669 if test ! -z "$PROG_PS" ; then
670 AC_DEFINE_UNQUOTED(PROG_PS, "$PROG_PS")
671 fi
672 if test ! -z "$PROG_W" ; then
673 AC_DEFINE_UNQUOTED(PROG_W, "$PROG_W")
674 fi
675 if test ! -z "$PROG_WHO" ; then
676 AC_DEFINE_UNQUOTED(PROG_WHO, "$PROG_WHO")
677 fi
678 if test ! -z "$PROG_LAST" ; then
679 AC_DEFINE_UNQUOTED(PROG_LAST, "$PROG_LAST")
680 fi
681 if test ! -z "$PROG_LASTLOG" ; then
682 AC_DEFINE_UNQUOTED(PROG_LASTLOG, "$PROG_LASTLOG")
683 fi
684 if test ! -z "$PROG_DF" ; then
685 AC_DEFINE_UNQUOTED(PROG_DF, "$PROG_DF")
686 fi
687 if test ! -z "$PROG_VMSTAT" ; then
688 AC_DEFINE_UNQUOTED(PROG_VMSTAT, "$PROG_VMSTAT")
689 fi
690 if test ! -z "$PROG_UPTIME" ; then
691 AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME")
692 fi
693 if test ! -z "$PROG_UPTIME" ; then
694 AC_DEFINE_UNQUOTED(PROG_UPTIME, "$PROG_UPTIME")
695 fi
696 if test ! -z "$PROG_TAIL" ; then
697 AC_DEFINE_UNQUOTED(PROG_TAIL, "$PROG_TAIL")
698 fi
699fi 662fi
663AC_SUBST(INSTALL_SSH_PRNG_CMDS)
664
700 665
701AC_ARG_WITH(catman, 666AC_ARG_WITH(catman,
702 [ --with-catman=man|cat Install preformatted manpages[no]], 667 [ --with-catman=man|cat Install preformatted manpages[no]],
@@ -932,4 +897,6 @@ if test ! -z "$blibpath" ; then
932 AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile]) 897 AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
933fi 898fi
934 899
935AC_OUTPUT(Makefile) 900AC_OUTPUT(Makefile ssh_prng_cmds)
901
902