diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-05-04 09:06:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-05-04 09:06:27 +0000 |
commit | cb4bd812c4d3ad6fc056a1ff3fec816563655513 (patch) | |
tree | 19c3cd4916297a7f85c073fe4108f8c6d1520062 | |
parent | 7231b7f83075957636215c82746916ce3fffc89f (diff) | |
download | libmicrohttpd-cb4bd812c4d3ad6fc056a1ff3fec816563655513.tar.gz libmicrohttpd-cb4bd812c4d3ad6fc056a1ff3fec816563655513.zip |
Bernd Kuhls <berndkuhls@hotmail.com> wrote:
Hi,
the latest release added
AC_CHECK_FILE([$with_gnutls/include/gnutls/gnutls.h],
to configure.ac which is not cross-compile aware, for the precise error
message have a look at the bottom of
http://autobuild.buildroot.net/results/cb2/cb2cec1295a40667a3c21060864dd0e65a
312c3e/build-end.log
The following patch fixes the problem
--- configure.ac 2014-05-02 20:38:40.000000000 +0200
+++ configure.ac 2014-05-04 09:17:00.000000000 +0200
@@ -639,8 +639,7 @@
SAVE_CPPFLAGS="$CPPFLAGS"
LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
- AC_CHECK_FILE([$with_gnutls/include/gnutls/gnutls.h],
- [AC_CHECK_HEADERS([gnutls/gnutls.h],
+ AC_CHECK_HEADERS([gnutls/gnutls.h],
[AC_CHECK_LIB([gnutls], [gnutls_priority_set],
[
GNUTLS_CPPFLAGS="-I$with_gnutls/include"
@@ -648,7 +647,7 @@
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])])
LDFLAGS="$SAVE_LDFLAGS"
CPPFLAGS="$SAVE_CPPFLAGS"
Regards, Bernd
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 5 |
2 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,6 @@ | |||
1 | Sun May 4 11:05:26 CEST 2014 | ||
2 | Fix gnutls header check to make it cross-compile aware. -BK | ||
3 | |||
1 | May 2 20:22:45 CEST 2014 | 4 | May 2 20:22:45 CEST 2014 |
2 | Fix infinite loop (DoS) when HTTP connection is reset (#3392). -GM | 5 | Fix infinite loop (DoS) when HTTP connection is reset (#3392). -GM |
3 | Fix possible issue from combination of epoll and suspend/resume | 6 | Fix possible issue from combination of epoll and suspend/resume |
diff --git a/configure.ac b/configure.ac index 53db5bca..ac623b36 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -639,8 +639,7 @@ AC_ARG_WITH(gnutls, | |||
639 | SAVE_CPPFLAGS="$CPPFLAGS" | 639 | SAVE_CPPFLAGS="$CPPFLAGS" |
640 | LDFLAGS="-L$with_gnutls/lib $LDFLAGS" | 640 | LDFLAGS="-L$with_gnutls/lib $LDFLAGS" |
641 | CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" | 641 | CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" |
642 | AC_CHECK_FILE([$with_gnutls/include/gnutls/gnutls.h], | 642 | AC_CHECK_HEADERS([gnutls/gnutls.h], |
643 | [AC_CHECK_HEADERS([gnutls/gnutls.h], | ||
644 | [AC_CHECK_LIB([gnutls], [gnutls_priority_set], | 643 | [AC_CHECK_LIB([gnutls], [gnutls_priority_set], |
645 | [ | 644 | [ |
646 | GNUTLS_CPPFLAGS="-I$with_gnutls/include" | 645 | GNUTLS_CPPFLAGS="-I$with_gnutls/include" |
@@ -648,7 +647,7 @@ AC_ARG_WITH(gnutls, | |||
648 | GNUTLS_LIBS="-lgnutls" | 647 | GNUTLS_LIBS="-lgnutls" |
649 | AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])]) | 648 | AC_CHECK_LIB([gnutls], [gnutls_load_file], [AC_CHECK_LIB([gnutls], [gnutls_privkey_import_x509_raw], [have_gnutls_sni=yes])]) |
650 | have_gnutls=yes | 649 | have_gnutls=yes |
651 | ])])]) | 650 | ])]) |
652 | AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) | 651 | AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) |
653 | LDFLAGS="$SAVE_LDFLAGS" | 652 | LDFLAGS="$SAVE_LDFLAGS" |
654 | CPPFLAGS="$SAVE_CPPFLAGS" | 653 | CPPFLAGS="$SAVE_CPPFLAGS" |