From 3789ac34f90b64e5c9937394a93ae7dadf678055 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 7 Feb 2014 11:45:19 +0100 Subject: [PATCH] Check for libgcrypt version 1.2 and later --- configure.ac | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3b951a9..ff8b239 100644 --- a/configure.ac +++ b/configure.ac @@ -65,16 +65,28 @@ AC_ARG_WITH(libgcrypt, [ --with-libgcrypt=DIR use libgcrypt-config in DIR],[ if test "$libgcryptpath" != "no"; then if test "$libgcryptpath" = "NONE"; then AC_PATH_PROG([libgcrypt],[libgcrypt-config],[NONE]) - else + elif test -x $libgcryptpath/libgcrypt-config; then libgcrypt=$libgcryptpath/libgcrypt-config + else + libgcrypt=$libgcryptpath fi AC_MSG_CHECKING([for libgcrypt]) if "$libgcrypt" --version >/dev/null 2>&1; then - LIBS="$LIBS `$libgcrypt --libs`" - CFLAGS="$CFLAGS `$libgcrypt --cflags`" libgcryptversion=`$libgcrypt --version` + libgcryptversion2=`echo "$libgcryptversion" | awk 'BEGIN { FS = "."; } { printf "%d", [$]1 * 1000 + [$]2;}'` AC_MSG_RESULT([$libgcryptversion]) - AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present]) + if test $libgcryptversion2 -ge 1002; then + LIBS="$LIBS `$libgcrypt --libs`" + CFLAGS="$CFLAGS `$libgcrypt --cflags`" + AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present]) + else + if test "$libgcryptpath" = "NONE"; then + AC_MSG_WARN([Only libgcrypt version 1.2 and later supported]) + else + AC_MSG_ERROR([Only libgcrypt version 1.2 and later supported]) + fi + libgcryptversion="" + fi else AC_MSG_RESULT([no]) fi -- 1.7.10.4