summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--configure.in8
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index e2ce122c3..9918b0b91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ install: all
79 ln -sf ssh $(bindir)/slogin 79 ln -sf ssh $(bindir)/slogin
80 ln -sf ssh.1 $(mandir)/man1/slogin.1 80 ln -sf ssh.1 $(mandir)/man1/slogin.1
81 81
82 if [ ! -z "@DISABLE_EXTERNAL_ASKPASS@" ] ; then \ 82 if [ ! -z "@INSTALL_ASKPASS@" ] ; then \
83 install -d $(libdir) ; \ 83 install -d $(libdir) ; \
84 install -d $(libdir)/ssh ; \ 84 install -d $(libdir)/ssh ; \
85 if [ -z "@GNOME_ASKPASS@" ] ; then \ 85 if [ -z "@GNOME_ASKPASS@" ] ; then \
diff --git a/configure.in b/configure.in
index ada1a2e96..d80ac7c7f 100644
--- a/configure.in
+++ b/configure.in
@@ -111,11 +111,9 @@ fi
111dnl Check whether use wants to disable the external ssh-askpass 111dnl Check whether use wants to disable the external ssh-askpass
112AC_ARG_WITH(askpass, 112AC_ARG_WITH(askpass,
113 [ --without-askpass Disable external ssh-askpass support], 113 [ --without-askpass Disable external ssh-askpass support],
114 [ 114 [AC_DEFINE(DISABLE_EXTERNAL_ASKPASS)],
115 AC_DEFINE(DISABLE_EXTERNAL_ASKPASS) 115 [INSTALL_ASKPASS="yes"]
116 DISABLE_EXTERNAL_ASKPASS=yes
117 AC_SUBST(DISABLE_EXTERNAL_ASKPASS)
118 ]
119) 116)
117AC_SUBST(INSTALL_ASKPASS)
120 118
121AC_OUTPUT(Makefile) 119AC_OUTPUT(Makefile)