diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-06 18:39:57 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-11-06 21:16:08 +0300 |
commit | 9046f74fa7f0d07cc56f28f4f7125f578b1bc884 (patch) | |
tree | bf46972d7ef72876a47cc77e55c40dc1d7d653b6 /configure.ac | |
parent | 042ca763558b9ce724e9850f9a89fa5aefe943ab (diff) | |
download | libmicrohttpd-9046f74fa7f0d07cc56f28f4f7125f578b1bc884.tar.gz libmicrohttpd-9046f74fa7f0d07cc56f28f4f7125f578b1bc884.zip |
configure: check for GnuTLS SNI support on all detection paths
and unify detection
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index abf436c9..3e5e26fd 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1388,7 +1388,6 @@ AC_ARG_WITH([[gnutls]], | |||
1388 | GNUTLS_CPPFLAGS="-I$with_gnutls/include" | 1388 | GNUTLS_CPPFLAGS="-I$with_gnutls/include" |
1389 | GNUTLS_LDFLAGS="-L$with_gnutls/lib" | 1389 | GNUTLS_LDFLAGS="-L$with_gnutls/lib" |
1390 | GNUTLS_LIBS="-lgnutls" | 1390 | GNUTLS_LIBS="-lgnutls" |
1391 | AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])]) | ||
1392 | have_gnutls=yes | 1391 | have_gnutls=yes |
1393 | ])], [], [AC_INCLUDES_DEFAULT]) | 1392 | ])], [], [AC_INCLUDES_DEFAULT]) |
1394 | AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) | 1393 | AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) |
@@ -1428,16 +1427,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1428 | have_gnutls=yes | 1427 | have_gnutls=yes |
1429 | GNUTLS_CPPFLAGS="$GNUTLS_CFLAGS" | 1428 | GNUTLS_CPPFLAGS="$GNUTLS_CFLAGS" |
1430 | GNUTLS_LDFLAGS="$GNUTLS_LIBS" | 1429 | GNUTLS_LDFLAGS="$GNUTLS_LIBS" |
1431 | AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]]) | ||
1432 | AC_LINK_IFELSE([ | ||
1433 | AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[ | ||
1434 | gnutls_datum_t data; | ||
1435 | gnutls_privkey_t key; | ||
1436 | gnutls_load_file("key.pem", &data); | ||
1437 | gnutls_privkey_import_x509_raw(key, &data, GNUTLS_X509_FMT_PEM, NULL, 0); | ||
1438 | gnutls_free(data.data); | ||
1439 | ]])], [[have_gnutls_sni=yes]], [[have_gnutls_sni=no]]) | ||
1440 | AC_MSG_RESULT([[$have_gnutls_sni]]) | ||
1441 | ], | 1430 | ], |
1442 | [ | 1431 | [ |
1443 | AC_MSG_RESULT([[no]]) | 1432 | AC_MSG_RESULT([[no]]) |
@@ -1459,7 +1448,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1459 | [AC_CHECK_LIB([gnutls], [gnutls_priority_set], | 1448 | [AC_CHECK_LIB([gnutls], [gnutls_priority_set], |
1460 | [ | 1449 | [ |
1461 | GNUTLS_LIBS="-lgnutls" | 1450 | GNUTLS_LIBS="-lgnutls" |
1462 | AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])]) | ||
1463 | have_gnutls=yes | 1451 | have_gnutls=yes |
1464 | ])], [], [AC_INCLUDES_DEFAULT]) | 1452 | ])], [], [AC_INCLUDES_DEFAULT]) |
1465 | ]) | 1453 | ]) |
@@ -1516,6 +1504,16 @@ AS_IF([test "x$have_gnutls" != "xyes" && test "x$with_gnutls" = "xyes"], [AC_MSG | |||
1516 | CFLAGS="$GNUTLS_CFLAGS $CFLAGS" | 1504 | CFLAGS="$GNUTLS_CFLAGS $CFLAGS" |
1517 | LDFLAGS="$GNUTLS_LIBS $LDFLAGS" | 1505 | LDFLAGS="$GNUTLS_LIBS $LDFLAGS" |
1518 | LIBS="$LIBS $GNUTLS_LIBS" | 1506 | LIBS="$LIBS $GNUTLS_LIBS" |
1507 | AC_MSG_CHECKING([[for gnutls_privkey_import_x509_raw()]]) | ||
1508 | AC_LINK_IFELSE([ | ||
1509 | AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[ | ||
1510 | gnutls_datum_t data; | ||
1511 | gnutls_privkey_t key; | ||
1512 | gnutls_load_file("key.pem", &data); | ||
1513 | gnutls_privkey_import_x509_raw(key, &data, GNUTLS_X509_FMT_PEM, NULL, 0); | ||
1514 | gnutls_free(data.data); | ||
1515 | ]])], [[have_gnutls_sni=yes]], [[have_gnutls_sni=no]]) | ||
1516 | AC_MSG_RESULT([[$have_gnutls_sni]]) | ||
1519 | AC_CACHE_CHECK([[whether GnuTLS require libgcrypt initialisaion]], [mhd_cv_grypt_required], | 1517 | AC_CACHE_CHECK([[whether GnuTLS require libgcrypt initialisaion]], [mhd_cv_grypt_required], |
1520 | [ | 1518 | [ |
1521 | AC_COMPILE_IFELSE( | 1519 | AC_COMPILE_IFELSE( |