summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-12 16:36:21 +1100
committerDamien Miller <djm@mindrot.org>1999-11-12 16:36:21 +1100
commit06e42932b2013525a29e9ce79148739cfb7a878f (patch)
treea9c98963dbae7703fb3a5a3aac6878bc33450a3a
parent3ba1fe19434222120596ab6f1a60eb2ae4d91f4d (diff)
askpass install fixV_1_2_PRE11
-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 e2ce122c..9918b0b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ install: all
ln -sf ssh $(bindir)/slogin
ln -sf ssh.1 $(mandir)/man1/slogin.1
- if [ ! -z "@DISABLE_EXTERNAL_ASKPASS@" ] ; then \
+ if [ ! -z "@INSTALL_ASKPASS@" ] ; then \
install -d $(libdir) ; \
install -d $(libdir)/ssh ; \
if [ -z "@GNOME_ASKPASS@" ] ; then \
diff --git a/configure.in b/configure.in
index ada1a2e9..d80ac7c7 100644
--- a/configure.in
+++ b/configure.in
@@ -111,11 +111,9 @@ fi
dnl Check whether use wants to disable the external ssh-askpass
AC_ARG_WITH(askpass,
[ --without-askpass Disable external ssh-askpass support],
- [
- AC_DEFINE(DISABLE_EXTERNAL_ASKPASS)
- DISABLE_EXTERNAL_ASKPASS=yes
- AC_SUBST(DISABLE_EXTERNAL_ASKPASS)
- ]
+ [AC_DEFINE(DISABLE_EXTERNAL_ASKPASS)],
+ [INSTALL_ASKPASS="yes"]
)
+AC_SUBST(INSTALL_ASKPASS)
AC_OUTPUT(Makefile)