From 1423045898bdea94dee99c5865b3a6257fafdf34 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 4 Jan 2017 22:11:32 +0100 Subject: include crypto library in version output --- src/configure | 16 +++++++++++----- src/options.c | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/configure b/src/configure index bd0cbaf..b94fdf2 100755 --- a/src/configure +++ b/src/configure @@ -183,28 +183,33 @@ case $TARGET in ;; esac - +CRYPTO_LIB_NAME="" case $CRYPTO_LIB in gcrypt) CFLAGS=$CFLAGS' -DUSE_GCRYPT' LDFLAGS=$LDFLAGS' -lgcrypt' - echo "using gcrypt library" + CRYPTO_LIB_NAME="libgcrypt" ;; nettle) CFLAGS=$CFLAGS' -DUSE_NETTLE' LDFLAGS=$LDFLAGS' -lnettle' - echo "using nettle library" + CRYPTO_LIB_NAME="Nettle" ;; ssl) CFLAGS=$CFLAGS' -DUSE_SSL_CRYPTO' LDFLAGS=$LDFLAGS' -lcrypto' - echo "using ssl crypto library" + CRYPTO_LIB_NAME="OpenSSL" ;; none) CFLAGS=$CFLAGS' -DNO_CRYPT' - echo "disabling crypto" + CRYPTO_LIB_NAME="none" + ;; + *) + echo "unknown crypto library: $$CRYPTO_LIB" + exit 1 ;; esac +echo "crypto-library: $CRYPTO_LIB_NAME" if [ $PASSPHRASE -eq 0 ]; then CFLAGS=$CFLAGS' -DNO_PASSPHRASE' @@ -283,6 +288,7 @@ cat > version.h <