this should be dead

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8521e060a4470f672cb76c6efd24dec850425cca..7f9cc219711bfce08ce473d3e42d36019e20d810 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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([])
   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.
@@ -1730,6 +1742,12 @@ then
   AC_MSG_NOTICE([NOTICE: bluetooth library not found.  bluetooth support will not be compiled.])
 fi
 
+# jansson
+if test "x$jansson" = "x0"
+then
+  AC_MSG_NOTICE([NOTICE: jansson library not found.  json support will not be compiled.])
+fi
+
 #gnutls
 if test x$gnutls != xtrue
 then
@@ -1782,9 +1800,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