- Refactor jsonapi into separate module
[oweals/gnunet.git] / configure.ac
index 3072684fc217c25131d2c83d27c397b955bba637..369ad99ee447e4be4aecf7e800a46b01f9a8f41f 100644 (file)
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2015 Christian Grothoff (and other contributing authors)
+# (C) 2001--2016 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
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNUnet; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 #
 # Process this file with autoconf to produce a configure script.
@@ -50,11 +50,6 @@ AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
 
-if test "$enable_shared" = "no"
-then
- AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.])
-fi
-
 CFLAGS="-Wall $CFLAGS"
 # use '-fno-strict-aliasing', but only if the compiler can take it
 if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1;
@@ -205,6 +200,10 @@ AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported]))
 AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false)
 AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY)
 
+AC_CHECK_PROG(VAR_SSH_BINARY,ssh,true,false)
+AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY)
+AM_CONDITIONAL(HAVE_SSH_KEY,  ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n)
+rm -f /tmp/gnunet_test_cosks_ssh_garbage
 
 
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
@@ -373,30 +372,41 @@ fi        # $build = $target
 # check for bluetooth library
 bluetooth=0
 AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)])
+if test "$build_target" = "mingw"
+then
+  bluetooth=1
+fi
+AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1])
 if test "$bluetooth" = 1
 then
-  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
   AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
 else
-  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])
 fi
-if test "$build_target" = "mingw"
+
+# check for jansson library
+jansson=0
+AC_CHECK_HEADER([jansson.h],jansson=1)
+AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
+if test "x$jansson" = x1
 then
-  bluetooth=1
+  AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])
+else
+  AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])
 fi
 
 # check for libpulse(audio) library
 pulse=0
 AC_CHECK_LIB(pulse,pa_stream_peek,
   [AC_CHECK_HEADER([pulse/simple.h],pulse=1)])
-if test "$pulse" = 1
-then
-  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
-fi
 if test "$build_target" = "mingw"
 then
   pulse=0
 fi
+if test "$pulse" = 1
+then
+  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
+fi
 
 # check for libopus(audio) library
 opus=0
@@ -445,15 +455,19 @@ then
   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)
+   conversation_backend=gst
+   AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
+   AM_CONDITIONAL(BUILD_GST_HELPERS, true)
+   AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
  fi
 else
+
  conversation_backend=pulse
  AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
  AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
 fi
 
 # libgnurl
@@ -464,26 +478,44 @@ then
        AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
 else
        AM_CONDITIONAL(HAVE_LIBGNURL, false)
+       AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl])
 fi
 
+SAVE_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS"
+LIBS="$LIBGNURL $LIBCURL $LIBS"
+
 # libcurl-gnutls
 LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
 if test "x$curl" = xtrue
 then
+
  AC_CHECK_HEADERS([curl/curl.h],
-   AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
-   [curl=false])
+  AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
+  [curl=false])
+ AC_CHECK_HEADERS([gnurl/curl.h],
+  AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],,[[#include <gnurl/curl.h>]]))
  # need libcurl-gnutls.so, everything else is not acceptable
  AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false])
  # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
-
 fi
+
+# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
+# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
+# *either* header set).
+AC_CHECK_HEADERS([curl/curl.h],,
+  curl=false
+  AC_CHECK_HEADERS([gnurl/curl.h],,
+  gnurl=false))
+
+
+
 if test x$curl = xfalse
 then
        AM_CONDITIONAL(HAVE_LIBCURL, false)
 if test "$gnurl" = 0
 then
-       AC_MSG_WARN([GNUnet requires libcurl-gnutls  >= 7.34])
+       AC_MSG_WARN([GNUnet requires libcurl-gnutls or gnurl >= 7.34])
 fi
 else
        AM_CONDITIONAL(HAVE_LIBCURL, true)
@@ -491,30 +523,9 @@ else
 fi
 
 
-# libidn
-AC_MSG_CHECKING([if Libidn can be used])
-AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
-                                    [Support IDN (needs GNU Libidn)]),
-libidn=$withval, libidn=yes)
-if test "$libidn" != "no"; then
-  if test "$libidn" != "yes"; then
-     LDFLAGS="${LDFLAGS} -L$libidn/lib"
-     CPPFLAGS="${CPPFLAGS} -I$libidn/include"
-  fi
-fi
-libidn=no
-AC_CHECK_HEADER(idna.h,
-  AC_CHECK_LIB(idn, stringprep_check_version,
-    [libidn=yes LIBS="${LIBS} -lidn"], []), [])
-if test "$libidn" != "yes"; then
-  AC_MSG_FAILURE([GNUnet requires libidn.
-libidn-1.13 should be sufficient, newer versions work too.])
-fi
-AC_MSG_RESULT($libidn)
-
-# restore LIBS
+# restore LIBS & CPPFLAGS
 LIBS=$SAVE_LIBS
-
+CPPFLAGS=$SAVE_CPPFLAGS
 
 AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
 # GLPK must support glpk_init_env, version >= 4.43
@@ -639,8 +650,75 @@ fi
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+
+# libidn
+AC_MSG_CHECKING([if Libidn can be used])
+AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
+                                    [Support IDN (needs GNU Libidn)]),
+libidn=$withval, libidn=yes)
+if test "$libidn" != "no"; then
+  if test "$libidn" != "yes"; then
+     LDFLAGS="${LDFLAGS} -L$libidn/lib"
+     CPPFLAGS="${CPPFLAGS} -I$libidn/include"
+  fi
+fi
+libidn=no
+AC_CHECK_HEADER(idna.h,
+  AC_CHECK_LIB(idn, stringprep_check_version,
+    [libidn=yes LIBS="${LIBS} -lidn"], []), [])
+if test "$libidn" != "yes"; then
+  AC_MSG_FAILURE([GNUnet requires libidn.
+libidn-1.13 should be sufficient, newer versions work too.])
+fi
+AC_MSG_RESULT($libidn)
+
+
+# test for zlib
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
+AC_ARG_WITH(zlib,
+           [  --with-zlib[[=DIR]]       use libz in DIR],
+           [AS_IF([test "$withval" = "no"],
+                  [AC_MSG_ERROR([GNUnet requires zlib])],
+                  [test "$withval" != "yes"],
+                  [
+                    Z_DIR=$withval
+                    CPPFLAGS="${CPPFLAGS} -I$withval/include"
+                    LDFLAGS="${LDFLAGS} -L$withval/lib"
+                  ])
+           ])
+AC_CHECK_HEADER(zlib.h,
+               [],
+               [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_CHECK_LIB(z, compress2,
+            [
+             AC_DEFINE([HAVE_ZLIB], [], [Have compression library])
+             if test "x${Z_DIR}" != "x"; then
+                     Z_CFLAGS="-I${Z_DIR}/include"
+                     Z_LIBS="-L${Z_DIR}/lib -lz"
+             else
+                     Z_LIBS="-lz"
+             fi],
+             [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_SUBST(Z_CFLAGS)
+AC_SUBST(Z_LIBS)
+
+if test "$enable_shared" = "no"
+then
+ AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.])
+fi
+
+
+
+# restore LIBS
+LIBS=$SAVE_LIBS
+
+
 fi
 
+# check for iconv
+AM_ICONV
+
 # test for libunistring
 gl_LIBUNISTRING
 if test $HAVE_LIBUNISTRING != yes; then
@@ -664,7 +742,7 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h strin
 
 
 # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
-AC_CHECK_HEADERS([malloc.h malloc/malloc.h malloc/malloc_np.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h])
+AC_CHECK_HEADERS([malloc.h malloc/malloc.h malloc/malloc_np.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h])
 
 # FreeBSD requires something more funky for netinet/in_systm.h and netinet/ip.h...
 AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h netinet/ip.h],,,
@@ -718,39 +796,13 @@ AC_SUBST(SQLITE_LDFLAGS)
 postgres=false
 AX_LIB_POSTGRESQL([])
 if test "$found_postgresql" = "yes"; then
-  postgres=true
+  CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+  AC_CHECK_HEADERS([libpq-fe.h],
+    postgres=true)
 fi
+
 AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
 
-# test for zlib
-SAVE_LDFLAGS=$LDFLAGS
-SAVE_CPPFLAGS=$CPPFLAGS
-AC_ARG_WITH(zlib,
-           [  --with-zlib[[=DIR]]       use libz in DIR],
-           [AS_IF([test "$withval" = "no"],
-                  [AC_MSG_ERROR([GNUnet requires zlib])],
-                  [test "$withval" != "yes"],
-                  [
-                    Z_DIR=$withval
-                    CPPFLAGS="${CPPFLAGS} -I$withval/include"
-                    LDFLAGS="${LDFLAGS} -L$withval/lib"
-                  ])
-           ])
-AC_CHECK_HEADER(zlib.h,
-               [],
-               [AC_MSG_ERROR([GNUnet requires zlib])])
-AC_CHECK_LIB(z, compress2,
-            [
-             AC_DEFINE([HAVE_ZLIB], [], [Have compression library])
-             if test "x${Z_DIR}" != "x"; then
-                     Z_CFLAGS="-I${Z_DIR}/include"
-                     Z_LIBS="-L${Z_DIR}/lib -lz"
-             else
-                     Z_LIBS="-lz"
-             fi],
-             [AC_MSG_ERROR([GNUnet requires zlib])])
-AC_SUBST(Z_CFLAGS)
-AC_SUBST(Z_LIBS)
 
 LDFLAGS=$SAVE_LDFLAGS
 CPPFLAGS=$SAVE_CPPFLAGS
@@ -779,13 +831,13 @@ AC_ARG_WITH(mysql,
     then
       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])
+        mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+    fi
    fi
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
@@ -856,12 +908,12 @@ AC_ARG_WITH(microhttpd,
         AC_CHECK_HEADERS([microhttpd.h],
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
               AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                #if (MHD_VERSION < 0x0093200)
-                #error needs at least version 0.9.32
+                #if (MHD_VERSION < 0x0094200)
+                #error needs at least version 0.9.42
                 #endif
                 int main () { return 0; }
                ])],
@@ -879,12 +931,12 @@ AC_ARG_WITH(microhttpd,
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
               EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
                AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                #if (MHD_VERSION < 0x0093200)
-                #error needs at least version 0.9.32
+                #if (MHD_VERSION < 0x0094200)
+                #error needs at least version 0.9.42
                 #endif
                 int main () { return 0; }
                ])],
@@ -901,12 +953,12 @@ AC_ARG_WITH(microhttpd,
     AC_CHECK_HEADERS([microhttpd.h],
       AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
         AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
-          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
+          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
               AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
-                #if (MHD_VERSION < 0x0093200)
-                #error needs at least version 0.9.32
+                #if (MHD_VERSION < 0x0094200)
+                #error needs at least version 0.9.42
                 #endif
                ])],
                [AC_MSG_RESULT(ok)
@@ -918,6 +970,9 @@ AC_ARG_WITH(microhttpd,
 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
@@ -928,10 +983,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
 # check for gettext
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.3])
-
-# check for iconv
-AM_ICONV
+AM_GNU_GETTEXT_VERSION([0.18.1])
 
 # Checks for standard typedefs, structures, and compiler characteristics.
 AC_TYPE_PID_T
@@ -969,7 +1021,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -1255,15 +1307,6 @@ AC_ARG_ENABLE([wachs],
 AC_MSG_RESULT($enable_wachs)
 AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"])
 
-# REST API
-AC_MSG_CHECKING(whether to compile REST API)
-AC_ARG_ENABLE([rest],
-   [AS_HELP_STRING([--enable-rest], [enable REST])],
-   [enable_rest=${enableval}],
-   [enable_rest=no])
-AC_MSG_RESULT($enable_rest)
-AM_CONDITIONAL([HAVE_REST], [test "x$enable_rest" = "xyes"])
-
 # should malicious code be compiled (should only be used for testing)?
 AC_MSG_CHECKING(whether to compile malicious code)
 AC_ARG_ENABLE([malicious],
@@ -1491,6 +1534,7 @@ src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
 src/conversation/conversation.conf
+src/curl/Makefile
 src/datacache/Makefile
 src/datastore/Makefile
 src/datastore/datastore.conf
@@ -1500,7 +1544,6 @@ src/dns/Makefile
 src/dns/dns.conf
 src/dv/Makefile
 src/dv/dv.conf
-src/env/Makefile
 src/exit/Makefile
 src/fragmentation/Makefile
 src/fs/Makefile
@@ -1514,6 +1557,7 @@ src/identity/Makefile
 src/identity/identity.conf
 src/include/Makefile
 src/integration-tests/Makefile
+src/json/Makefile
 src/hostlist/Makefile
 src/multicast/Makefile
 src/multicast/multicast.conf
@@ -1530,7 +1574,9 @@ src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
 src/peerstore/Makefile
 src/peerstore/peerstore.conf
+src/pq/Makefile
 src/postgres/Makefile
+src/psycutil/Makefile
 src/psyc/Makefile
 src/psyc/psyc.conf
 src/psycstore/Makefile
@@ -1544,10 +1590,6 @@ src/rps/Makefile
 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
@@ -1569,6 +1611,7 @@ src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
 src/rest/Makefile
+src/identity-provider/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetats.pc
@@ -1597,6 +1640,7 @@ pkgconfig/gnunetnamestore.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpq.pc
 pkgconfig/gnunetpostgres.pc
 pkgconfig/gnunetpsyc.pc
 pkgconfig/gnunetpsycstore.pc
@@ -1632,9 +1676,9 @@ then
 fi
 
 # libgnurl
-if test "x$gnurl" = "x0"
+if test "$gnurl" = "0"
 then
-  if test "x$curl" = "x0"
+  if test "x$curl" = "xfalse"
   then
     AC_MSG_NOTICE([NOTICE: libgnurl not found.  http client support will not be compiled.])
     AC_MSG_WARN([ERROR: libgnurl not found.  hostlist daemon will not be compiled, and you probably WANT the hostlist daemon])
@@ -1710,9 +1754,9 @@ fi
 
 AC_MSG_NOTICE([********************************************
 Please make sure NOW that you have created a user and group 'gnunet'
-and additionally a group 'gnunetdns':
+and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, type:
         addgroup gnunetdns
-        adduser gnunet
+        adduser --system --group --disabled-login --home /var/lib/gnunet gnunet
 
 Make sure that '/var/lib/gnunet' is owned (and writable) by user
 'gnunet'.  Then, you can compile GNUnet with
@@ -1729,6 +1773,8 @@ require fresh login to come into effect):
 "USERNAME" with the respective login names).  If you have a global IP
 address, no further configuration is required.
 
+For more detailed setup instructions, see https://gnunet.org/installation
+
 Optionally, download and compile gnunet-gtk to get a GUI for
 file-sharing and configuration.  This is particularly recommended
 if your network setup is non-trivial, as gnunet-setup can be