|
@ -1,10 +1,9 @@ |
|
|
--- a/configure.ac
|
|
|
--- a/configure.ac
|
|
|
+++ b/configure.ac
|
|
|
+++ b/configure.ac
|
|
|
@@ -153,25 +153,9 @@
|
|
|
|
|
|
]) |
|
|
|
|
|
|
|
|
@@ -154,24 +154,8 @@ AS_IF([test "x$want_crypto" = "xauto" -o
|
|
|
AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [ |
|
|
AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [ |
|
|
PKG_CHECK_MODULES(MBEDTLS, [mbedtls >= $POLARSSL_MINIMUM], |
|
|
PKG_CHECK_MODULES(MBEDTLS, [mbedtls >= $POLARSSL_MINIMUM], |
|
|
- [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes],
|
|
|
|
|
|
|
|
|
[want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes], |
|
|
- [AC_CHECK_HEADER([polarssl/version.h],
|
|
|
- [AC_CHECK_HEADER([polarssl/version.h],
|
|
|
- [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h>
|
|
|
- [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h>
|
|
|
- #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM
|
|
|
- #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM
|
|
@ -23,7 +22,6 @@ |
|
|
- [AS_IF([test "x$want_crypto" = "xpolarssl"],
|
|
|
- [AS_IF([test "x$want_crypto" = "xpolarssl"],
|
|
|
- [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])]
|
|
|
- [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])]
|
|
|
- )]
|
|
|
- )]
|
|
|
+ [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes],
|
|
|
|
|
|
+ [AS_IF([test "x$want_crypto" = "xpolarssl"],
|
|
|
+ [AS_IF([test "x$want_crypto" = "xpolarssl"],
|
|
|
+ [AC_MSG_ERROR([PolarSSL support requested, but library not found.])]
|
|
|
+ [AC_MSG_ERROR([PolarSSL support requested, but library not found.])]
|
|
|
)] |
|
|
)] |
|
|