[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32947 - in libmicrohttpd: . src/testcurl/https
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32947 - in libmicrohttpd: . src/testcurl/https |
Date: |
Mon, 7 Apr 2014 22:50:28 +0200 |
Author: Karlson2k
Date: 2014-04-07 22:50:28 +0200 (Mon, 07 Apr 2014)
New Revision: 32947
Modified:
libmicrohttpd/configure.ac
libmicrohttpd/src/testcurl/https/Makefile.am
Log:
Fix curl HTTPS test with GnuTLS specific version
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2014-04-07 20:26:20 UTC (rev 32946)
+++ libmicrohttpd/configure.ac 2014-04-07 20:50:28 UTC (rev 32947)
@@ -538,6 +538,7 @@
GNUTLS_LDFLAGS=""
GNUTLS_LIBS=""
have_gnutls=no
+have_gnutls_sni=no
AC_MSG_CHECKING(for gnutls)
AC_ARG_WITH(gnutls,
[AC_HELP_STRING([--with-gnutls=PFX],[base of gnutls installation])],
@@ -549,6 +550,7 @@
AC_CHECK_HEADERS([gnutls/gnutls.h],
[AC_CHECK_LIB([gnutls], [gnutls_priority_set], [
GNUTLS_LIBS="-lgnutls"
+ AC_CHECK_LIB([gnutls], [gnutls_load_file],
[AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw],
[have_gnutls_sni=yes])])
have_gnutls=yes])])
;;
*)
@@ -563,6 +565,7 @@
GNUTLS_CPPFLAGS="-I$with_gnutls/include"
GNUTLS_LDFLAGS="-L$with_gnutls/lib"
GNUTLS_LIBS="-lgnutls"
+ AC_CHECK_LIB([gnutls], [gnutls_load_file],
[AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw],
[have_gnutls_sni=yes])])
have_gnutls=yes
])])])
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_CHECK_LIB([gnutls], [gnutls_priority_set],
[
GNUTLS_LIBS="-lgnutls"
+ AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls],
[gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])])
have_gnutls=yes
])])])
AM_CONDITIONAL(HAVE_GNUTLS, test "x$have_gnutls" = "xyes")
+AM_CONDITIONAL([HAVE_GNUTLS_SNI], [test "x$have_gnutls_sni" = "xyes"])
AC_SUBST([GNUTLS_CPPFLAGS])
AC_SUBST([GNUTLS_LDFLAGS])
Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am 2014-04-07 20:26:20 UTC
(rev 32946)
+++ libmicrohttpd/src/testcurl/https/Makefile.am 2014-04-07 20:50:28 UTC
(rev 32947)
@@ -4,6 +4,10 @@
AM_CFLAGS = --coverage
endif
+if HAVE_GNUTLS_SNI
+ TEST_HTTPS_SNI = test_https_sni
+endif
+
CPU_COUNT_DEF = -DCPU_COUNT=$(CPU_COUNT)
AM_CPPFLAGS = \
@@ -17,7 +21,7 @@
test_tls_authentication \
test_https_multi_daemon \
test_https_get \
- test_https_sni \
+ $(TEST_HTTPS_SNI) \
test_https_get_select \
test_https_get_parallel \
test_https_get_parallel_threads \
@@ -32,7 +36,7 @@
test_tls_options \
test_https_multi_daemon \
test_https_get \
- test_https_sni \
+ $(TEST_HTTPS_SNI) \
test_https_get_select \
test_https_get_parallel \
test_https_get_parallel_threads \
@@ -122,6 +126,7 @@
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
$(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
+if HAVE_GNUTLS_SNI
test_https_sni_SOURCES = \
test_https_sni.c \
tls_test_common.c
@@ -132,6 +137,7 @@
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
$(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@
+endif
test_https_get_select_SOURCES = \
test_https_get_select.c \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32947 - in libmicrohttpd: . src/testcurl/https,
gnunet <=