changeset 1158:ef67b57fe438

fix default build when getpass() is unavailable if the system doesn't support getpass, we still default on the options that require it which causes a build failure. instead, only default enable these when getpass is available.
author Mike Frysinger <vapier@gentoo.org>
date Wed, 21 Oct 2015 22:48:15 +0800
parents 14854ea32d2c
children f567a4152c14
files configure.ac options.h
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Oct 21 22:40:11 2015 +0800
+++ b/configure.ac	Wed Oct 21 22:48:15 2015 +0800
@@ -632,7 +632,7 @@
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([dup2 getspnam getusershell memset putenv select socket strdup clearenv strlcpy strlcat daemon basename _getpty getaddrinfo freeaddrinfo getnameinfo fork writev])
+AC_CHECK_FUNCS([dup2 getpass getspnam getusershell memset putenv select socket strdup clearenv strlcpy strlcat daemon basename _getpty getaddrinfo freeaddrinfo getnameinfo fork writev])
 
 AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
 
--- a/options.h	Wed Oct 21 22:40:11 2015 +0800
+++ b/options.h	Wed Oct 21 22:48:15 2015 +0800
@@ -220,9 +220,12 @@
 #define ENABLE_SVR_PUBKEY_OPTIONS
 #endif
 
+/* This requires getpass. */
+#ifdef HAVE_GETPASS
 #define ENABLE_CLI_PASSWORD_AUTH
+#define ENABLE_CLI_INTERACT_AUTH
+#endif
 #define ENABLE_CLI_PUBKEY_AUTH
-#define ENABLE_CLI_INTERACT_AUTH
 
 /* A default argument for dbclient -i <privatekey>. 
 Homedir is prepended unless path begins with / */