Commit 45d87529 authored by David Woodhouse's avatar David Woodhouse

Clean up build options printout

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 7c70b63c
...@@ -180,28 +180,37 @@ static void helpmessage(void) ...@@ -180,28 +180,37 @@ static void helpmessage(void)
static void print_build_opts(void) static void print_build_opts(void)
{ {
const char *comma = ", ", *sep = comma + 1;
#if defined (OPENCONNECT_OPENSSL)
printf(_("Using OpenSSL. Features present:"));
#elif defined (OPENCONNECT_GNUTLS)
printf(_("Using GnuTLS. Features present:"));
#endif
if (openconnect_has_tss_blob_support()) {
printf("%sTPM", sep);
sep = comma;
}
#if defined (OPENCONNECT_OPENSSL) && defined (HAVE_ENGINE) #if defined (OPENCONNECT_OPENSSL) && defined (HAVE_ENGINE)
if (openconnect_has_tss_blob_support()) else {
printf(_("Using OpenSSL with TPM ENGINE support. Loading TPM engine succeeded.\n")); printf("%sTPM (%s)", sep, _("OpenSSL ENGINE not present"));
else sep = comma;
printf(_("Using OpenSSL with TPM ENGINE support, but loading TPM engine failed.\n")); }
#elif defined (OPENCONNECT_OPENSSL)
printf(_("Using OpenSSL without TPM ENGINE support\n"));
#elif defined (OPENCONNECT_GNUTLS) && defined (HAVE_P11KIT)
printf(_("Using GnuTLS with PKCS#11 token support\n"));
#elif defined (OPENCONNECT_GNUTLS)
printf(_("Using GnuTLS without PKCS#11 token support\n"));
#else
#error wtf
#endif #endif
#ifndef HAVE_DTLS if (openconnect_has_pkcs11_support()) {
printf(_("No DTLS support in this binary\n")); printf("%sPKCS#11", sep);
#elif defined (DTLS_OPENSSL) sep = comma;
printf(_("Using OpenSSL for DTLS support\n")); }
#elif defined (DTLS_GNUTLS)
printf(_("Using GnuTLS for DTLS support\n")); #ifdef HAVE_DTLS
printf("%sDTLS", sep);
#if defined (OPENCONNECT_GNUTLS) && defined (DTLS_OPENSSL)
printf(" (%s)", _("using OpenSSL"));
#endif
printf("\n");
#else #else
#error wtf printf(_("\nWARNING: No DTLS support in this binary. Performance will be impaired.\n"));
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment