X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=1a24513929cdf45557881602ce286519a7acd183;hb=3e22103e0cecfeb8a03e65733fd0ab5c475a302b;hp=bd230860d46c8de04925b3032e1dbb2cacad8cae;hpb=904c52b2f3ae39e324d548e68179cd6af2b06833;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index bd230860d..1a2451392 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,6 +269,13 @@ AC_ARG_ENABLE(linker-hardening,
 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)]),
@@ -567,7 +574,14 @@ AC_ARG_ENABLE([taler-wallet],
    [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
@@ -724,9 +738,12 @@ gl_LIBUNISTRING
 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
+fi
 AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
 
 # restore LIBS
@@ -796,14 +813,16 @@ AC_SUBST(SQLITE_LDFLAGS)
 
 # test for postgres
 postgres=false
-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)
+# 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
-
 AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
 
 
@@ -1562,6 +1581,8 @@ src/gnsrecord/Makefile
 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