tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 23:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Further cleanup of askpass autoconf support, enable GNOME askpass option

Browse Source 
only if askpass has first been enabled.
This commit is contained in:
Damien Miller 1999-11-15 14:36:53 +11:00
parent d05a247953
commit cedfecc99e
1 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
configure.in
View File

@ -57,10 +57,6 @@ AC_CHECK_LIB(pam, pam_authenticate, , )
dnl Checks for header files. dnl Checks for header files.
AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h) AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h)
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin)
dnl Check for ut_host field in utmp dnl Check for ut_host field in utmp
AC_MSG_CHECKING([whether utmp.h has ut_host field]) AC_MSG_CHECKING([whether utmp.h has ut_host field])
AC_EGREP_HEADER(ut_host, utmp.h, AC_EGREP_HEADER(ut_host, utmp.h,
@ -68,15 +64,54 @@ AC_EGREP_HEADER(ut_host, utmp.h,
[AC_MSG_RESULT(no)] [AC_MSG_RESULT(no)]
) )
dnl Check whether user wants GNOME ssh-askpass dnl Checks for library functions.
AC_ARG_WITH(gnome-askpass, AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin)
[ --with-gnome-askpass Build and use the GNOME passphrase requester],
[GNOME_ASKPASS="gnome-ssh-askpass"]) dnl Check whether use wants to disable the external ssh-askpass
AC_SUBST(GNOME_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=no)],
[
if test x$withval = xno ; then
INSTALL_ASKPASS="no"
else
INSTALL_ASKPASS="yes"
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)
if test -z "$GNOME_ASKPASS" ; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
fi
fi
dnl Check for user-specified random device dnl Check for user-specified random device
AC_ARG_WITH(random, AC_ARG_WITH(random,
[ --with-random=FILE read randomness from FILE (default /dev/urandom)], [ --with-random=FILE read randomness from FILE (default=/dev/urandom)],
[ [
RANDOM_POOL="$withval"; RANDOM_POOL="$withval";
AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
@ -95,7 +130,7 @@ AC_ARG_WITH(random,
dnl Check for EGD pool file dnl Check for EGD pool file
AC_ARG_WITH(egd-pool, AC_ARG_WITH(egd-pool,
[ --with-egd-pool=FILE read randomness from EGD pool FILE], [ --with-egd-pool=FILE read randomness from EGD pool FILE (default none)],
[ [
RANDOM_POOL="$withval"; RANDOM_POOL="$withval";
AC_DEFINE(HAVE_EGD) AC_DEFINE(HAVE_EGD)
@ -104,31 +139,9 @@ AC_ARG_WITH(egd-pool,
] ]
) )
dnl Make sure we have random number support
if test -z "$RANDOM_POOL" -a -z "$EGD_POOL"; then if test -z "$RANDOM_POOL" -a -z "$EGD_POOL"; then
AC_MSG_ERROR([No random device found, and no EGD random pool specified]) AC_MSG_ERROR([No random device found, and no EGD random pool specified])
fi fi
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)],
[
if test x$withval = xno ; then
INSTALL_ASKPASS="no"
else
INSTALL_ASKPASS="yes"
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
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)