summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in5
-rw-r--r--configure.in13
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 @@
120010208 120010208
2 - (djm) Don't delete external askpass program in make uninstall target. 2 - (djm) Don't delete external askpass program in make uninstall target.
3 Report and fix from Roumen Petrov <roumen.petrov@skalasoft.com> 3 Report and fix from Roumen Petrov <roumen.petrov@skalasoft.com>
4 - (djm) Fix linking of sftp, don't need arc4random any more.
5 - (djm) Try to use shell that supports "test -S" for EGD socket search.
6 Based on patch from Tim Rice <tim@multitalents.net>
4 7
520010207 820010207
6 - (bal) Save the whole path to AR in configure. Some Solaris 2.7 installs 9 - (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 @@
1# $Id: Makefile.in,v 1.148 2001/02/07 21:22:47 djm Exp $ 1# $Id: Makefile.in,v 1.149 2001/02/07 23:07:09 djm Exp $
2 2
3prefix=@prefix@ 3prefix=@prefix@
4exec_prefix=@exec_prefix@ 4exec_prefix=@exec_prefix@
@@ -110,9 +110,8 @@ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o
110sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o 110sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o
111 $(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 111 $(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
112 112
113# XXX: need to -lssh twice here!
114sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o 113sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o
115 $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) 114 $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
116 115
117# test driver for the loginrec code - not built by default 116# test driver for the loginrec code - not built by default
118logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o 117logintest: 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)
14AC_PATH_PROG(ENT, ent) 14AC_PATH_PROG(ENT, ent)
15AC_SUBST(ENT) 15AC_SUBST(ENT)
16AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin) 16AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin)
17AC_PATH_PROG(TEST_MINUS_S_SH, bash)
18AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
19AC_PATH_PROG(TEST_MINUS_S_SH, sh)
17 20
18if test -z "$AR" ; then 21if test -z "$AR" ; then
19 AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***]) 22 AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***])
@@ -1079,14 +1082,18 @@ AC_ARG_WITH(egd-pool,
1079 if test -z "$RANDOM_POOL" ; then 1082 if test -z "$RANDOM_POOL" ; then
1080 AC_MSG_CHECKING(for PRNGD/EGD socket) 1083 AC_MSG_CHECKING(for PRNGD/EGD socket)
1081 # Insert other locations here 1084 # Insert other locations here
1082 for egdsock in /var/run/egd-pool /etc/entropy ; do 1085 for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do
1083 if test -S $egdsock ; then 1086 if $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
1084 EGD_SOCKET="$egdsock" 1087 EGD_SOCKET="$egdsock"
1085 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") 1088 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
1086 AC_MSG_RESULT($egdsock)
1087 break; 1089 break;
1088 fi 1090 fi
1089 done 1091 done
1092 if test -x "$EGD_SOCKET" ; then
1093 AC_MSG_RESULT($EGD_SOCKET)
1094 else
1095 AC_MSG_RESULT(not found)
1096 fi
1090 fi 1097 fi
1091 ] 1098 ]
1092) 1099)