- Configure, Make and changelog corrections from Tudor Bosman

   <tudorb@jm.nu> and Niels Kristian Bech Jensen <nkbj@image.dk>

diff --git a/ChangeLog b/ChangeLog
index 04561846e682332e4c2b2d46a929877cd632eb6a..b66bb4e20fa58d4598933a53a0509290078fe850 100644 (file)
--- 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 4400c258cc78edcf575e049a8855c0f0ea34421f..298790a36bed3dff3d0d95a9bca8059c43586627 100644 (file)
--- 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 a831b92102238877cabbbd4dd17c2af82b3b4710..709e289b0e4d264b46a3e85c1d5e82d46024739b 100644 (file)
--- 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)]
 )