diff options
-rw-r--r-- | INSTALL | 3 | ||||
-rw-r--r-- | Makefile.in | 12 | ||||
-rw-r--r-- | configure.in | 47 |
3 files changed, 16 insertions, 46 deletions
@@ -82,9 +82,6 @@ Daemon support and to specify a EGD pool socket. You will need to | |||
82 | use this if your Unix does not support the /dev/urandom device (or | 82 | use this if your Unix does not support the /dev/urandom device (or |
83 | similar). | 83 | similar). |
84 | 84 | ||
85 | --without-askpass will disable X11 password requestor support in | ||
86 | ssh-add | ||
87 | |||
88 | --with-kerberos4 will enable Kerberos IV support. You will need to | 85 | --with-kerberos4 will enable Kerberos IV support. You will need to |
89 | have the Kerberos libraries and header files installed for this to | 86 | have the Kerberos libraries and header files installed for this to |
90 | work. | 87 | work. |
diff --git a/Makefile.in b/Makefile.in index ec7f0fd75..ed42562aa 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -83,14 +83,10 @@ install: all | |||
83 | ln -sf ssh $(bindir)/slogin | 83 | ln -sf ssh $(bindir)/slogin |
84 | ln -sf ssh.1 $(mandir)/man1/slogin.1 | 84 | ln -sf ssh.1 $(mandir)/man1/slogin.1 |
85 | 85 | ||
86 | if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \ | 86 | $(INSTALL) -d $(libexecdir) ; |
87 | $(INSTALL) -d $(libexecdir) ; \ | 87 | $(INSTALL) -d $(libexecdir)/ssh ; |
88 | $(INSTALL) -d $(libexecdir)/ssh ; \ | 88 | if [ -z "@GNOME_ASKPASS@" ] ; then \ |
89 | if [ -z "@GNOME_ASKPASS@" ] ; then \ | 89 | $(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \ |
90 | $(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \ | ||
91 | else \ | ||
92 | $(INSTALL) -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \ | ||
93 | fi ; \ | ||
94 | fi | 90 | fi |
95 | 91 | ||
96 | if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ | 92 | if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ |
diff --git a/configure.in b/configure.in index b0dde23ee..037478a6c 100644 --- a/configure.in +++ b/configure.in | |||
@@ -137,46 +137,23 @@ AC_TRY_COMPILE( | |||
137 | ] | 137 | ] |
138 | ) | 138 | ) |
139 | 139 | ||
140 | dnl Check whether use wants to disable the external ssh-askpass | 140 | AC_MSG_CHECKING([whether to build GNOME ssh-askpass]) |
141 | INSTALL_ASKPASS="yes" | 141 | dnl Check whether user wants GNOME ssh-askpass |
142 | AC_MSG_CHECKING([whether to enable external ssh-askpass support]) | 142 | AC_ARG_WITH(gnome-askpass, |
143 | AC_ARG_WITH(askpass, | 143 | [ --with-gnome-askpass Build the GNOME passphrase requester (default=no)], |
144 | [ --with-askpass=yes/no Enable external ssh-askpass support (default=yes)], | ||
145 | [ | 144 | [ |
146 | if test x$withval = xno ; then | 145 | if test x$withval = xno ; then |
147 | INSTALL_ASKPASS="no" | 146 | GNOME_ASKPASS=""; |
148 | else | 147 | else |
149 | INSTALL_ASKPASS="yes" | 148 | GNOME_ASKPASS="gnome-ssh-askpass"; |
150 | fi | 149 | fi |
151 | ] | 150 | ]) |
152 | ) | 151 | AC_SUBST(GNOME_ASKPASS) |
153 | if test "x$INSTALL_ASKPASS" = "xyes" ; then | ||
154 | AC_DEFINE(USE_EXTERNAL_ASKPASS) | ||
155 | AC_SUBST(INSTALL_ASKPASS) | ||
156 | AC_MSG_RESULT(yes) | ||
157 | else | ||
158 | AC_MSG_RESULT(no) | ||
159 | fi | ||
160 | |||
161 | if test "x$INSTALL_ASKPASS" = "xyes" ; then | ||
162 | AC_MSG_CHECKING([whether to build GNOME ssh-askpass]) | ||
163 | dnl Check whether user wants GNOME ssh-askpass | ||
164 | AC_ARG_WITH(gnome-askpass, | ||
165 | [ --with-gnome-askpass Build the GNOME passphrase requester (default=no)], | ||
166 | [ | ||
167 | if test x$withval = xno ; then | ||
168 | GNOME_ASKPASS=""; | ||
169 | else | ||
170 | GNOME_ASKPASS="gnome-ssh-askpass"; | ||
171 | fi | ||
172 | ]) | ||
173 | AC_SUBST(GNOME_ASKPASS) | ||
174 | 152 | ||
175 | if test -z "$GNOME_ASKPASS" ; then | 153 | if test -z "$GNOME_ASKPASS" ; then |
176 | AC_MSG_RESULT(no) | 154 | AC_MSG_RESULT(no) |
177 | else | 155 | else |
178 | AC_MSG_RESULT(yes) | 156 | AC_MSG_RESULT(yes) |
179 | fi | ||
180 | fi | 157 | fi |
181 | 158 | ||
182 | dnl Check for user-specified random device | 159 | dnl Check for user-specified random device |