- simplify loglevel

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7685bd9d3abad912f52e3860b3a66e37f99f60af..e5d37958943aff8405916580dc420d1d9ea66631 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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.
@@ -200,6 +200,8 @@ 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)
 
 
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
@@ -497,7 +499,7 @@ 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)
@@ -962,7 +964,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
 # check for gettext
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.3])
+AM_GNU_GETTEXT_VERSION([0.18.1])
 
 # Checks for standard typedefs, structures, and compiler characteristics.
 AC_TYPE_PID_T
@@ -1663,7 +1665,7 @@ then
 fi
 
 # libgnurl
-if test "x$gnurl" = "xfalse"
+if test "$gnurl" = "0"
 then
   if test "x$curl" = "xfalse"
   then
@@ -1741,9 +1743,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
@@ -1760,6 +1762,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