From 4864e8f9c023509845e772b43bbd98fdf81d6e72 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 8 Feb 2001 10:07:08 +1100 Subject: - (djm) Fix linking of sftp, don't need arc4random any more. - (djm) Try to use shell that supports "test -S" for EGD socket search. Based on patch from Tim Rice --- ChangeLog | 3 +++ Makefile.in | 5 ++--- configure.in | 13 ++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7902d5113..02a43ec8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 20010208 - (djm) Don't delete external askpass program in make uninstall target. Report and fix from Roumen Petrov + - (djm) Fix linking of sftp, don't need arc4random any more. + - (djm) Try to use shell that supports "test -S" for EGD socket search. + Based on patch from Tim Rice 20010207 - (bal) Save the whole path to AR in configure. Some Solaris 2.7 installs diff --git a/Makefile.in b/Makefile.in index 1138a832b..af82ea15b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.148 2001/02/07 21:22:47 djm Exp $ +# $Id: Makefile.in,v 1.149 2001/02/07 23:07:09 djm Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -110,9 +110,8 @@ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o $(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -# XXX: need to -lssh twice here! sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o - $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) + $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) # test driver for the loginrec code - not built by default logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o diff --git a/configure.in b/configure.in index 8f7f5d2b7..e99d01602 100644 --- a/configure.in +++ b/configure.in @@ -14,6 +14,9 @@ AC_SUBST(PERL) AC_PATH_PROG(ENT, ent) AC_SUBST(ENT) AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin) +AC_PATH_PROG(TEST_MINUS_S_SH, bash) +AC_PATH_PROG(TEST_MINUS_S_SH, ksh) +AC_PATH_PROG(TEST_MINUS_S_SH, sh) if test -z "$AR" ; then AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***]) @@ -1079,14 +1082,18 @@ AC_ARG_WITH(egd-pool, if test -z "$RANDOM_POOL" ; then AC_MSG_CHECKING(for PRNGD/EGD socket) # Insert other locations here - for egdsock in /var/run/egd-pool /etc/entropy ; do - if test -S $egdsock ; then + for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do + if $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then EGD_SOCKET="$egdsock" AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") - AC_MSG_RESULT($egdsock) break; fi done + if test -x "$EGD_SOCKET" ; then + AC_MSG_RESULT($EGD_SOCKET) + else + AC_MSG_RESULT(not found) + fi fi ] ) -- cgit v1.2.3