aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-04-07 20:50:28 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-04-07 20:50:28 +0000
commit5fe37b899b0f62e7a6281f34b7921be007e289e2 (patch)
tree6bae258fcced0d94ef7a948cc874df14e66616bf /configure.ac
parentc196047666c45da71db68f9beebbf605c2d47544 (diff)
downloadlibmicrohttpd-5fe37b899b0f62e7a6281f34b7921be007e289e2.tar.gz
libmicrohttpd-5fe37b899b0f62e7a6281f34b7921be007e289e2.zip
Fix curl HTTPS test with GnuTLS specific version
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 579133c6..dd2b14d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -538,6 +538,7 @@ GNUTLS_CFLAGS=""
538GNUTLS_LDFLAGS="" 538GNUTLS_LDFLAGS=""
539GNUTLS_LIBS="" 539GNUTLS_LIBS=""
540have_gnutls=no 540have_gnutls=no
541have_gnutls_sni=no
541AC_MSG_CHECKING(for gnutls) 542AC_MSG_CHECKING(for gnutls)
542AC_ARG_WITH(gnutls, 543AC_ARG_WITH(gnutls,
543 [AC_HELP_STRING([--with-gnutls=PFX],[base of gnutls installation])], 544 [AC_HELP_STRING([--with-gnutls=PFX],[base of gnutls installation])],
@@ -549,6 +550,7 @@ AC_ARG_WITH(gnutls,
549 AC_CHECK_HEADERS([gnutls/gnutls.h], 550 AC_CHECK_HEADERS([gnutls/gnutls.h],
550 [AC_CHECK_LIB([gnutls], [gnutls_priority_set], [ 551 [AC_CHECK_LIB([gnutls], [gnutls_priority_set], [
551 GNUTLS_LIBS="-lgnutls" 552 GNUTLS_LIBS="-lgnutls"
553 AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
552 have_gnutls=yes])]) 554 have_gnutls=yes])])
553 ;; 555 ;;
554 *) 556 *)
@@ -563,6 +565,7 @@ AC_ARG_WITH(gnutls,
563 GNUTLS_CPPFLAGS="-I$with_gnutls/include" 565 GNUTLS_CPPFLAGS="-I$with_gnutls/include"
564 GNUTLS_LDFLAGS="-L$with_gnutls/lib" 566 GNUTLS_LDFLAGS="-L$with_gnutls/lib"
565 GNUTLS_LIBS="-lgnutls" 567 GNUTLS_LIBS="-lgnutls"
568 AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
566 have_gnutls=yes 569 have_gnutls=yes
567 ])])]) 570 ])])])
568 AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) 571 AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])])
@@ -576,9 +579,11 @@ AC_ARG_WITH(gnutls,
576 [AC_CHECK_LIB([gnutls], [gnutls_priority_set], 579 [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
577 [ 580 [
578 GNUTLS_LIBS="-lgnutls" 581 GNUTLS_LIBS="-lgnutls"
582 AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
579 have_gnutls=yes 583 have_gnutls=yes
580 ])])]) 584 ])])])
581AM_CONDITIONAL(HAVE_GNUTLS, test "x$have_gnutls" = "xyes") 585AM_CONDITIONAL(HAVE_GNUTLS, test "x$have_gnutls" = "xyes")
586AM_CONDITIONAL([HAVE_GNUTLS_SNI], [test "x$have_gnutls_sni" = "xyes"])
582 587
583AC_SUBST([GNUTLS_CPPFLAGS]) 588AC_SUBST([GNUTLS_CPPFLAGS])
584AC_SUBST([GNUTLS_LDFLAGS]) 589AC_SUBST([GNUTLS_LDFLAGS])