projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into credentials
[oweals/gnunet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9a3441fa2db2953a56c6d09989061a40bb2b6e41..1a24513929cdf45557881602ce286519a7acd183 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
# This file is part of GNUnet.
# This file is part of GNUnet.
-# (C) 2001--201
5 Christian Grothoff (and other contributing authors)
+# (C) 2001--201
6 GNUnet e.V.
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
@@
-34,7
+34,7
@@
AC_CONFIG_HEADERS([gnunet_config.h])
AH_TOP([#define _GNU_SOURCE 1])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_AWK
AH_TOP([#define _GNU_SOURCE 1])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_AWK
-AC_PROG_CC
+AC_PROG_CC
_C99
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_OBJC
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_OBJC
@@
-269,6
+269,13
@@
AC_ARG_ENABLE(linker-hardening,
fi])
fi])
+AC_ARG_ENABLE(sanitizer,
+ AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined Behavior Sanitizer),
+[if test x$enableval = xyes; then
+ LDFLAGS="$CFLAGS -fsanitize=address,undefined,unsigned-integer-overflow -fsanitize-recover=all -fno-omit-frame-pointer"
+fi])
+
+
extra_logging=GNUNET_NO
AC_ARG_ENABLE([logging],
AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),
extra_logging=GNUNET_NO
AC_ARG_ENABLE([logging],
AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),
@@
-455,15
+462,19
@@
then
conversation_backend=none
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
conversation_backend=none
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
else
conversation_backend=gst
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
AM_CONDITIONAL(BUILD_GST_HELPERS, true)
else
conversation_backend=gst
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
AM_CONDITIONAL(BUILD_GST_HELPERS, true)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
fi
else
fi
else
+
conversation_backend=pulse
AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
conversation_backend=pulse
AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
fi
# libgnurl
fi
# libgnurl
@@
-563,7
+574,14
@@
AC_ARG_ENABLE([taler-wallet],
[taler_only=${enableval}],
[taler_only=no])
AC_MSG_RESULT($taler_only)
[taler_only=${enableval}],
[taler_only=no])
AC_MSG_RESULT($taler_only)
-AM_CONDITIONAL([TALER_ONLY], [test "x$taler_only" = "xyes"])
+if test "x$taler_only" = "xyes"
+then
+ AM_CONDITIONAL([TALER_ONLY],true)
+ AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet])
+else
+ AM_CONDITIONAL([TALER_ONLY],false)
+ AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation])
+fi
# test for libextractor
extractor=0
# test for libextractor
extractor=0
@@
-720,9
+738,14
@@
gl_LIBUNISTRING
if test $HAVE_LIBUNISTRING != yes; then
AC_MSG_ERROR([GNUnet requires libunistring])
fi
if test $HAVE_LIBUNISTRING != yes; then
AC_MSG_ERROR([GNUnet requires libunistring])
fi
-if test $gl_libunistring_hexversion -le 2305; then
+# under emscripten, $gl_libunistring_hexversion is undefined
+if test "$taler_only" != yes; then
+if test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305; then
AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
fi
AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
fi
+fi
+AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
+
# restore LIBS
LIBS=$SAVE_LIBS
# restore LIBS
LIBS=$SAVE_LIBS
@@
-790,13
+813,16
@@
AC_SUBST(SQLITE_LDFLAGS)
# test for postgres
postgres=false
# test for postgres
postgres=false
-AX_LIB_POSTGRESQL([])
-if test "$found_postgresql" = "yes"; then
- CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
- AC_CHECK_HEADERS([libpq-fe.h],
- postgres=true)
+# even running the check for postgres breaks emscripten ...
+if test "$taler_only" != yes; then
+ AX_LIB_POSTGRESQL([])
+ if test "$found_postgresql" = "yes"; then
+ CFLAGS="$CFLAGS $POSTGRESQL_CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+ AC_CHECK_HEADERS([libpq-fe.h],
+ postgres=true)
+ fi
fi
fi
-
AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
@@
-820,21
+846,27
@@
SAVE_CPPFLAGS=$CPPFLAGS
AC_MSG_CHECKING(for mysql)
AC_ARG_WITH(mysql,
[ --with-mysql=PFX base of MySQL installation],
AC_MSG_CHECKING(for mysql)
AC_ARG_WITH(mysql,
[ --with-mysql=PFX base of MySQL installation],
- [AC_MSG_RESULT("$with_mysql")
- if test "$with_mysql" != "no"
- then
- if test "$with_mysql" != "yes"
- then
+ [AC_MSG_RESULT([$with_mysql])
+ case $with_mysql in
+ no)
+ ;;
+ yes|"")
+ AC_CHECK_HEADERS(mysql/mysql.h,
+ AC_CHECK_LIB(mysqlclient, mysql_init,
+
+ mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+ ;;
+ *)
LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
- fi
- AC_CHECK_HEADERS(mysql/mysql.h,
- AC_CHECK_LIB(mysqlclient, mysql_init,
- MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
- MYSQL_CPPFLAGS="-I$with_mysql/include"
+ AC_CHECK_HEADERS(mysql/mysql.h,
+ AC_CHECK_LIB(mysqlclient, mysql_init,
+ MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
+ MYSQL_CPPFLAGS="-I$with_mysql/include"
- mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
- fi
+ mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+ ;;
+ esac
],
[AC_MSG_RESULT([--with-mysql not specified])
if test -d "/usr/lib64/mysql"; then
],
[AC_MSG_RESULT([--with-mysql not specified])
if test -d "/usr/lib64/mysql"; then
@@
-900,7
+932,7
@@
AC_ARG_WITH(microhttpd,
case $with_microhttpd in
no)
;;
case $with_microhttpd in
no)
;;
- yes)
+ yes
|""
)
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
@@
-966,7
+998,7
@@
AC_ARG_WITH(microhttpd,
AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
-AM_CONDITIONAL(HAVE_
REST, [test x$lmhd = x1 -a
x$jansson = x1])
+AM_CONDITIONAL(HAVE_
JSON, [test
x$jansson = x1])
# restore LIBS
LIBS=$SAVE_LIBS
# restore LIBS
LIBS=$SAVE_LIBS
@@
-1528,6
+1560,7
@@
src/consensus/Makefile
src/consensus/consensus.conf
src/conversation/Makefile
src/conversation/conversation.conf
src/consensus/consensus.conf
src/conversation/Makefile
src/conversation/conversation.conf
+src/curl/Makefile
src/datacache/Makefile
src/datastore/Makefile
src/datastore/datastore.conf
src/datacache/Makefile
src/datastore/Makefile
src/datastore/datastore.conf
@@
-1537,7
+1570,6
@@
src/dns/Makefile
src/dns/dns.conf
src/dv/Makefile
src/dv/dv.conf
src/dns/dns.conf
src/dv/Makefile
src/dv/dv.conf
-src/env/Makefile
src/exit/Makefile
src/fragmentation/Makefile
src/fs/Makefile
src/exit/Makefile
src/fragmentation/Makefile
src/fs/Makefile
@@
-1549,11
+1581,16
@@
src/gnsrecord/Makefile
src/hello/Makefile
src/identity/Makefile
src/identity/identity.conf
src/hello/Makefile
src/identity/Makefile
src/identity/identity.conf
+src/credential/Makefile
+src/credential/credential.conf
src/include/Makefile
src/integration-tests/Makefile
src/include/Makefile
src/integration-tests/Makefile
+src/json/Makefile
+src/jsonapi/Makefile
src/hostlist/Makefile
src/multicast/Makefile
src/multicast/multicast.conf
src/hostlist/Makefile
src/multicast/Makefile
src/multicast/multicast.conf
+src/my/Makefile
src/mysql/Makefile
src/namecache/Makefile
src/namecache/namecache.conf
src/mysql/Makefile
src/namecache/Makefile
src/namecache/namecache.conf
@@
-1567,7
+1604,9
@@
src/peerinfo/peerinfo.conf
src/peerinfo-tool/Makefile
src/peerstore/Makefile
src/peerstore/peerstore.conf
src/peerinfo-tool/Makefile
src/peerstore/Makefile
src/peerstore/peerstore.conf
+src/pq/Makefile
src/postgres/Makefile
src/postgres/Makefile
+src/psycutil/Makefile
src/psyc/Makefile
src/psyc/psyc.conf
src/psycstore/Makefile
src/psyc/Makefile
src/psyc/psyc.conf
src/psycstore/Makefile
@@
-1581,10
+1620,6
@@
src/rps/Makefile
src/rps/rps.conf
src/secretsharing/Makefile
src/secretsharing/secretsharing.conf
src/rps/rps.conf
src/secretsharing/Makefile
src/secretsharing/secretsharing.conf
-src/sensor/Makefile
-src/sensor/sensor.conf
-src/sensordashboard/Makefile
-src/sensordashboard/sensordashboard.conf
src/scalarproduct/Makefile
src/scalarproduct/scalarproduct.conf
src/set/Makefile
src/scalarproduct/Makefile
src/scalarproduct/scalarproduct.conf
src/set/Makefile
@@
-1596,6
+1631,8
@@
src/statistics/statistics.conf
src/template/Makefile
src/testbed/Makefile
src/testbed/testbed.conf
src/template/Makefile
src/testbed/Makefile
src/testbed/testbed.conf
+src/testbed-logger/Makefile
+src/testbed-logger/testbed-logger.conf
src/testing/Makefile
src/topology/Makefile
src/transport/Makefile
src/testing/Makefile
src/topology/Makefile
src/transport/Makefile
@@
-1606,7
+1643,7
@@
src/util/resolver.conf
src/vpn/Makefile
src/vpn/vpn.conf
src/rest/Makefile
src/vpn/Makefile
src/vpn/vpn.conf
src/rest/Makefile
-src/identity-
token
/Makefile
+src/identity-
provider
/Makefile
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetats.pc
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetats.pc
@@
-1635,6
+1672,7
@@
pkgconfig/gnunetnamestore.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpq.pc
pkgconfig/gnunetpostgres.pc
pkgconfig/gnunetpsyc.pc
pkgconfig/gnunetpsycstore.pc
pkgconfig/gnunetpostgres.pc
pkgconfig/gnunetpsyc.pc
pkgconfig/gnunetpsycstore.pc