Permalink
Browse files

Look for mbedtls before polarssl

PolarSSL has been renamed to mbed TLS

Fixes #2336

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
(cherry picked from commit 933de4e3a2797f6362c9bc24fa69aaeaad171d1b)
  • Loading branch information...
1 parent e25a09c commit 5c8bba2b1337fd356aa48456eb6152259bcf8c7d @rubenk rubenk committed Apr 28, 2015
Showing with 11 additions and 7 deletions.
  1. +11 −7 m4/pdns_with_system_polarssl.m4
@@ -5,8 +5,15 @@ AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[
[with_system_polarssl=no],
)
+ POLARSSL_SUBDIR=polarssl
+ POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/ext/$POLARSSL_SUBDIR/include/
+ POLARSSL_LIBS="-L\$(top_builddir)/pdns/ext/$POLARSSL_SUBDIR/library/ -lpolarssl"
+
AS_IF([test "x$with_system_polarssl" = "xyes"],[
- AC_CHECK_LIB([polarssl], [sha1_hmac],[
+ OLD_LIBS=$LIBS
+ LIBS=""
+ AC_SEARCH_LIBS([sha1_hmac], [mbedtls polarssl],[
+ POLARSSL_LIBS=$LIBS
AC_MSG_CHECKING([for PolarSSL version >= 1.1])
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(
@@ -23,17 +30,14 @@ AC_DEFUN([PDNS_WITH_SYSTEM_POLARSSL],[
AC_MSG_RESULT([$have_system_polarssl])
],
[have_system_polarssl=no]
- )],
+ )
+ LIBS=$OLD_LIBS
+ ],
[have_system_polarssl=no]
)
- POLARSSL_SUBDIR=polarssl
- POLARSSL_CFLAGS=-I\$\(top_srcdir\)/pdns/ext/$POLARSSL_SUBDIR/include/
- POLARSSL_LIBS="-L\$(top_builddir)/pdns/ext/$POLARSSL_SUBDIR/library/ -lpolarssl"
-
AS_IF([test "x$have_system_polarssl" = "xyes"],[
POLARSSL_CFLAGS=
- POLARSSL_LIBS=-lpolarssl
POLARSSL_SUBDIR=
],[
AS_IF([test "x$with_system_polarssl" = "xyes"],[

0 comments on commit 5c8bba2

Please sign in to comment.