Removed old with-askpass option

diff --git a/INSTALL b/INSTALL
index 69afc8fc12402a8e30ba4b616b26dcd91e829317..d3e37ca4ddf6b1a85bddeb0ea5bd153c1b0d1739 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -82,9 +82,6 @@ Daemon support and to specify a EGD pool socket. You will need to
 use this if your Unix does not support the /dev/urandom device (or
 similar).
 
---without-askpass will disable X11 password requestor support in
-ssh-add
-
 --with-kerberos4 will enable Kerberos IV support. You will need to
 have the Kerberos libraries and header files installed for this to
 work.

diff --git a/Makefile.in b/Makefile.in
index ec7f0fd7519bcf9dbc649661e3415e891e4374b9..ed42562aa6f53fee29f479aef7bac05d8ca4ff55 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,14 +83,10 @@ install: all
        ln -sf ssh $(bindir)/slogin
        ln -sf ssh.1 $(mandir)/man1/slogin.1
 
-       if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
-               $(INSTALL) -d $(libexecdir) ; \
-               $(INSTALL) -d $(libexecdir)/ssh ; \
-               if [ -z "@GNOME_ASKPASS@" ] ; then \
-                       $(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
-               else \
-                       $(INSTALL) -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
-               fi ; \
+       $(INSTALL) -d $(libexecdir) ;
+       $(INSTALL) -d $(libexecdir)/ssh ;
+       if [ -z "@GNOME_ASKPASS@" ] ; then \
+               $(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
        fi
 
        if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \

diff --git a/configure.in b/configure.in
index b0dde23ee516206c63a2fee16d35c5ec734f0095..037478a6c0fb116f0dadad8627fe417aca6c57aa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -137,46 +137,23 @@ AC_TRY_COMPILE(
        ]
 ) 
 
-dnl Check whether use wants to disable the external ssh-askpass
-INSTALL_ASKPASS="yes"
-AC_MSG_CHECKING([whether to enable external ssh-askpass support])
-AC_ARG_WITH(askpass,
-       [  --with-askpass=yes/no   Enable external ssh-askpass support (default=yes)],
+AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
+dnl Check whether user wants GNOME ssh-askpass
+AC_ARG_WITH(gnome-askpass,
+       [  --with-gnome-askpass    Build the GNOME passphrase requester (default=no)],
        [
                if test x$withval = xno ; then
-                       INSTALL_ASKPASS="no"
+                       GNOME_ASKPASS="";
                else
-                       INSTALL_ASKPASS="yes"
+                       GNOME_ASKPASS="gnome-ssh-askpass";
                fi
-       ]
-)
-if test "x$INSTALL_ASKPASS" = "xyes" ; then
-       AC_DEFINE(USE_EXTERNAL_ASKPASS)
-       AC_SUBST(INSTALL_ASKPASS)
-       AC_MSG_RESULT(yes)
-else
-       AC_MSG_RESULT(no)
-fi
-
-if test "x$INSTALL_ASKPASS" = "xyes" ; then
-       AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
-       dnl Check whether user wants GNOME ssh-askpass
-       AC_ARG_WITH(gnome-askpass,
-               [  --with-gnome-askpass    Build the GNOME passphrase requester (default=no)],
-               [
-                       if test x$withval = xno ; then
-                               GNOME_ASKPASS="";
-                       else
-                               GNOME_ASKPASS="gnome-ssh-askpass";
-                       fi
-               ])
-       AC_SUBST(GNOME_ASKPASS)
+       ])
+AC_SUBST(GNOME_ASKPASS)
 
-       if test -z "$GNOME_ASKPASS" ; then
-               AC_MSG_RESULT(no)
-       else
-               AC_MSG_RESULT(yes)
-       fi
+if test -z "$GNOME_ASKPASS" ; then
+       AC_MSG_RESULT(no)
+else
+       AC_MSG_RESULT(yes)
 fi
 
 dnl Check for user-specified random device