# will be more selective!
SAVE_LIBS=$LIBS
-# libgnurx (regex library for W32)
-gnurx=0
-AC_CHECK_LIB(gnurx, regexec, gnurx=1)
-if test "x$gnurx" = "x0" -a "x$build_target" = "xmingw"
+# tests only run on Windows
+if test "x$build_target" = "xmingw"
then
- AC_MSG_ERROR([on W32 GNUnet needs libgnurx])
+ AC_CHECK_LIB(plibc, plibc_init, [], [AC_MSG_ERROR([GNUnet requires PlibC on Windows])])
+ AC_CHECK_LIB(gnurx, regexec, [], [AC_MSG_ERROR([GNUnet requires libgnurx on Windows])])
fi
# libgcrypt
AM_CONDITIONAL(HAVE_LIBGNURL, false)
fi
+# libcurl-gnutls
+LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
+if test "x$curl" = xtrue
+then
+ AC_CHECK_HEADERS([curl/curl.h],
+ AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
+ [curl=false])
+ # need libcurl-gnutls.so, everything else is not acceptable
+ AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false])
+ # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
+
+fi
+if test x$curl = xfalse
+then
+ AM_CONDITIONAL(HAVE_LIBCURL, false)
+ AC_MSG_WARN([GNUnet requires libcurl-gnutls >= 7.34])
+else
+ AM_CONDITIONAL(HAVE_LIBCURL, true)
+ AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])
+fi
+
# libidn
AC_MSG_CHECKING([if Libidn can be used])
# test for postgres
postgres=false
-AC_MSG_CHECKING(for postgres)
-AC_ARG_WITH(postgres,
- [ --with-postgres=PFX base of postgres installation],
- [AC_MSG_RESULT("$with_postgres")
- case $with_postgres in
- no)
- ;;
- yes)
- AC_CHECK_HEADERS(postgresql/libpq-fe.h,
- postgres=true)
- ;;
- *)
- LDFLAGS="-L$with_postgres/lib $LDFLAGS"
- CPPFLAGS="-I$with_postgres/include $CPPFLAGS"
- AC_CHECK_HEADERS(postgresql/libpq-fe.h,
- EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH"
- POSTGRES_LDFLAGS="-L$with_postgres/lib"
- POSTGRES_CPPFLAGS="-I$with_postgres/include"
- postgres=true)
- LDFLAGS=$SAVE_LDFLAGS
- CPPFLAGS=$SAVE_CPPFLAGS
- ;;
- esac
- ],
- [AC_MSG_RESULT([--with-postgres not specified])
- AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)])
-AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue)
-AC_SUBST(POSTGRES_CPPFLAGS)
-AC_SUBST(POSTGRES_LDFLAGS)
+AX_LIB_POSTGRESQL([])
+if test "$found_postgresql" = "yes"; then
+ postgres=true
+fi
+AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
# test for zlib
SAVE_LDFLAGS=$LDFLAGS
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
- [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+ [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include "$native_srcdir/src/include/platform.h"
#include <microhttpd.h>
- int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+ int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
])], [
AC_MSG_RESULT(ok)
lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
- [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+ [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include "$native_srcdir/src/include/platform.h"
#include <microhttpd.h>
- int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+ int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
])], [
AC_MSG_RESULT(ok)
lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
- [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+ [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include "$native_srcdir/src/include/platform.h"
#include <microhttpd.h>
- int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+ int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
])], [
AC_MSG_RESULT(ok)
lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
[malicious=0
enable_malicious=no])
AC_MSG_RESULT($enable_malicious)
-AM_CONDITIONAL([ENABLE_MALICIOUS], [$malicious])
+AM_CONDITIONAL([ENABLE_MALICIOUS], [1=$malicious])
AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious],
[enable compilation of malicious code])
# libgnurl
if test "x$gnurl" = "x0"
then
- AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.])
- AC_MSG_WARN([libgnurl not found. hostlist daemon will not be compiled, and you probably WANT hostlist daemon])
+ if test "x$curl" = "x0"
+ then
+ AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.])
+ AC_MSG_WARN([ERROR: libgnurl not found. hostlist daemon will not be compiled, and you probably WANT the hostlist daemon])
+ else
+ AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.])
+ fi
fi
+
# bluetooth
if test "x$bluetooth" = "x0"
then