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 79cfa2ec2a76e75800892523a4450a96cbad9861..1a24513929cdf45557881602ce286519a7acd183 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-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)]),
@@
-567,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
@@
-724,9
+738,12
@@
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
AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
# restore LIBS
@@
-796,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)
@@
-826,11
+846,17
@@
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"
AC_CHECK_HEADERS(mysql/mysql.h,
LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
AC_CHECK_HEADERS(mysql/mysql.h,
@@
-839,8
+865,8
@@
AC_ARG_WITH(mysql,
MYSQL_CPPFLAGS="-I$with_mysql/include"
mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
MYSQL_CPPFLAGS="-I$with_mysql/include"
mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
- fi
- fi
+ ;;
+ 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
@@
-906,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],
@@
-1555,6
+1581,8
@@
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/json/Makefile
src/include/Makefile
src/integration-tests/Makefile
src/json/Makefile