summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-22 22:31:49 +1100
committerDamien Miller <djm@mindrot.org>1999-11-22 22:31:49 +1100
commitf7c0f82ceed409baabeec7771a3514b33231cc8b (patch)
treef06e0ec55548fde0c5b49a2f2f7422b485215eb2
parent66c14888e3939b8d8cf2847c6f01210dd86d9996 (diff)
- Configure, Make and changelog corrections from Tudor Bosman
<tudorb@jm.nu> and Niels Kristian Bech Jensen <nkbj@image.dk>
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in3
-rw-r--r--configure.in4
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 04561846..b66bb4e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
- Only display public key comment when presenting ssh-askpass dialog
- Released 1.2pre14
+ - Configure, Make and changelog corrections from Tudor Bosman
+ <tudorb@jm.nu> and Niels Kristian Bech Jensen <nkbj@image.dk>
+
19991121
- OpenBSD CVS Changes:
- [channels.c]
@@ -60,7 +63,7 @@
- EGD uses a socket, not a named pipe. Duh.
- Fix includes in fingerprint.c
- Fix scp progress bar bug again.
- - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of
+ - Move ssh-askpass from ${libdir}/ssh to ${libexecdir}/ssh at request of
David Rankin <drankin@bohemians.lexington.ky.us>
- Added autoconf option to enable Kerberos 4 support (untested)
- Added autoconf option to enable AFS support (untested)
diff --git a/Makefile.in b/Makefile.in
index 4400c258..298790a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
-libdir=@libdir@
libexecdir=@libexecdir@
mandir=@mandir@
sysconfdir=@sysconfdir@
@@ -83,7 +82,7 @@ install: all
ln -sf ssh.1 $(mandir)/man1/slogin.1
if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
- install -d $(libdir) ; \
+ install -d $(libexecdir) ; \
install -d $(libexecdir)/ssh ; \
if [ -z "@GNOME_ASKPASS@" ] ; then \
install -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
diff --git a/configure.in b/configure.in
index a831b921..709e289b 100644
--- a/configure.in
+++ b/configure.in
@@ -284,7 +284,7 @@ AC_ARG_WITH(skey,
)
dnl Check whether user wants TCP wrappers support
-AC_ARG_WITH(skey,
+AC_ARG_WITH(tcp-wrappers,
[ --with-tcp-wrappers Enable tcpwrappers support],
[
AC_DEFINE(LIBWRAP)
@@ -293,7 +293,7 @@ AC_ARG_WITH(skey,
)
dnl Check whether to enable MD5 passwords
-AC_ARG_WITH(md5passwords,
+AC_ARG_WITH(md5-passwords,
[ --with-md5-passwords Enable use of MD5 passwords],
[AC_DEFINE(HAVE_MD5_PASSWORDS)]
)