[GNUnet-SVN] r33160 - libmicrohttpd

[gnunet]

Author: grothoff
Date: 2014-05-04 11:06:27 +0200 (Sun, 04 May 2014)
New Revision: 33160

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
Log:
Bernd Kuhls <address@hidden> 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



Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2014-05-02 21:01:37 UTC (rev 33159)
+++ libmicrohttpd/ChangeLog     2014-05-04 09:06:27 UTC (rev 33160)
@@ -1,3 +1,6 @@
+Sun May  4 11:05:26 CEST 2014
+       Fix gnutls header check to make it cross-compile aware. -BK
+
 May  2 20:22:45 CEST 2014
        Fix infinite loop (DoS) when HTTP connection is reset (#3392). -GM
        Fix possible issue from combination of epoll and suspend/resume

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2014-05-02 21:01:37 UTC (rev 33159)
+++ libmicrohttpd/configure.ac  2014-05-04 09:06:27 UTC (rev 33160)
@@ -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"