- merge with master

1 files changed, 19 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index 924b06849..76f627597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2016 GNUnet e.V.
+# (C) 2001--2017 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
@@ -811,13 +811,15 @@ AM_CONDITIONAL(HAVE_SQLITE, test x$sqlite = xtrue)
 AC_SUBST(SQLITE_CPPFLAGS)
 AC_SUBST(SQLITE_LDFLAGS)
 
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
+
 # test for postgres
 postgres=false
 # even running the check for postgres breaks emscripten ...
 if test "$taler_only" != yes; then
-  AX_LIB_POSTGRESQL([])
+  AX_LIB_POSTGRESQL([9.5])
   if test "$found_postgresql" = "yes"; then
-    CFLAGS="$CFLAGS $POSTGRESQL_CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
     AC_CHECK_HEADERS([libpq-fe.h],
       postgres=true)
@@ -1030,6 +1032,16 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
       #include <netinet/in.h>
    ])
 
+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
+   [ AC_DEFINE(HAVE_SOCKADDR_UN_SUN_LEN, 1, [Do we have sockaddr_un.sun_len?])
+   ],
+   [],
+   [
+      #include <sys/types.h>
+      #include <sys/socket.h>
+      #include <sys/un.h>
+   ])
+
 
 
 # Checks for library functions.
@@ -1324,15 +1336,6 @@ AC_ARG_ENABLE([experimental],
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
-# FTBFS right now...
-AC_MSG_CHECKING(whether to compile ATS test code)
-AC_ARG_ENABLE([wachs],
-   [AS_HELP_STRING([--enable-wachs], [enable compiling ATS test code])],
-   [enable_wachs=${enableval}],
-   [enable_wachs=no])
-AC_MSG_RESULT($enable_wachs)
-AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"])
-
 # should malicious code be compiled (should only be used for testing)?
 AC_MSG_CHECKING(whether to compile malicious code)
 AC_ARG_ENABLE([malicious],
@@ -1630,6 +1633,7 @@ src/set/Makefile
 src/set/set.conf
 src/social/Makefile
 src/social/social.conf
+src/sq/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/template/Makefile
@@ -1790,9 +1794,11 @@ then
   AC_MSG_NOTICE([NOTICE: Mac OS X framework build enabled.])
 fi
 
-if test "x$SUDO_BINARY" = "x" -a ! -w /
+if test "x$install_nss" = "x0"
 then
   AC_MSG_NOTICE([NOTICE: --with-sudo not specified and not running as 'root', will not install GNS NSS library])
+else
+  AC_MSG_NOTICE([NOTICE: Will to install GNS NSS library to $NSS_DIR])
 fi