Fix typo in dv

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a30a540eef285c224529cb6a35e4cf95a5a9f66c..2d9fe0b06709b4647801801225733d7e353cd45a 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,
@@ -368,31 +370,31 @@ fi        # $build = $target
 # check for bluetooth library
 bluetooth=0
 AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],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)
-fi
 if test "$build_target" = "mingw"
 then
   bluetooth=1
 fi
+AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1])
+if test "$bluetooth" = 1         
+then
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
+else
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth 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
@@ -442,9 +444,9 @@ then
   AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
   AM_CONDITIONAL(BUILD_GST_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)
  fi
 else
  conversation_backend=pulse
@@ -460,6 +462,7 @@ 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
@@ -496,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)
@@ -777,10 +780,14 @@ 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)
 
+
 LDFLAGS=$SAVE_LDFLAGS
 CPPFLAGS=$SAVE_CPPFLAGS
 
@@ -957,7 +964,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
 # check for gettext
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.3])
+AM_GNU_GETTEXT_VERSION([0.18.1])
 
 # Checks for standard typedefs, structures, and compiler characteristics.
 AC_TYPE_PID_T
@@ -1595,6 +1602,7 @@ src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
 src/rest/Makefile
+src/identity-token/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetats.pc
@@ -1658,7 +1666,7 @@ then
 fi
 
 # libgnurl
-if test "x$gnurl" = "xfalse"
+if test "$gnurl" = "0"
 then
   if test "x$curl" = "xfalse"
   then
@@ -1736,9 +1744,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
@@ -1755,6 +1763,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