# This file is part of GNUnet.
-# (C) 2001--2013 Christian Grothoff (and other contributing authors)
+# (C) 2001--2014 Christian Grothoff (and other contributing authors)
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.10.0], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.10.1], [bug-gnunet@gnu.org])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
AC_CHECK_LIB(intl, gettext)
- LDFLAGS="$LDFLAGS -no-undefined"
CFLAGS="-mms-bitfields $CFLAGS"
build_target="cygwin"
LIBPREFIX=lib
AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system])
AC_CHECK_LIB(intl, gettext)
- LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
+ LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32"
CFLAGS="-mms-bitfields $CFLAGS"
CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
AC_DEFINE([HAVE_OPUS],[1],[Have libopus library])
fi
+# libogg
+AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
+ [AC_CHECK_HEADERS([ogg/ogg.h],
+ AM_CONDITIONAL(HAVE_OGG, true)
+ ogg=1
+ AC_DEFINE(HAVE_OGG,1,[Have ogg]),
+ AM_CONDITIONAL(HAVE_OGG, false)
+ ogg=0
+ AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
+ AM_CONDITIONAL(HAVE_OGG, false)
+ ogg=0)
+
+
+
gst=0
PKG_CHECK_MODULES(
[GST],
])
# Pulse Audio
-if test "x$pulse" != "x1" -o "x$opus" != "x1"
+if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"
then
- if test "x$gst" != "x1" -o "x$opus" != "x1"
+ if test "x$gst" != "x1"
then
conversation_backend=none
AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
LDFLAGS="${LDFLAGS} -L$libidn/lib"
CPPFLAGS="${CPPFLAGS} -I$libidn/include"
fi
- AC_CHECK_HEADER(idna.h,
- AC_CHECK_LIB(idn, stringprep_check_version,
- [libidn=yes LIBS="${LIBS} -lidn"],
- AC_MSG_FAILURE([GNUnet requires libidn])),
- AC_MSG_FAILURE([GNUnet requires libidn]))
+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)
# gnutls
gnutls=0
+gnutls_dane=0
AC_MSG_CHECKING(for gnutls)
AC_ARG_WITH(gnutls,
[ --with-gnutls=PFX base of gnutls installation],
AC_CHECK_HEADERS([gnutls/abstract.h],
AC_CHECK_LIB([gnutls], [gnutls_priority_set],
gnutls=true))
+ AC_CHECK_HEADERS([gnutls/dane.h],
+ AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+ gnutls_dane=1))
;;
*)
LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
AC_CHECK_LIB([gnutls], [gnutls_priority_set],
EXT_LIB_PATH="-L$with_gnutls/lib $EXT_LIB_PATH"
gnutls=true))
+ AC_CHECK_HEADERS([gnutls/dane.h],
+ AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+ gnutls_dane=1))
;;
esac
],
[AC_MSG_RESULT([--with-gnutls not specified])
AC_CHECK_HEADERS([gnutls/abstract.h],
AC_CHECK_LIB([gnutls], [gnutls_priority_set],
- gnutls=true))])
+ gnutls=true))
+ AC_CHECK_HEADERS([gnutls/dane.h],
+ AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+ gnutls_dane=1))
+ ])
AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS])
-gnutls_dane=0
-AC_CHECK_HEADERS([gnutls/dane.h],
- AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
- gnutls_dane=1))
AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support])
# sqlite
if test "x$sqlite" = "x0"
then
- AC_MSG_NOTICE([NOTICE: sqlite not found. sqLite support will not be compiled.])
+ AC_MSG_ERROR([ERROR: sqlite3 not found, but sqlite3 is required.])
fi
# libgnurl
if test "x$gnurl" = "x0"
then
AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.])
+ AC_MSG_WARN([libgnurl not found. hostlist daemon will not be compiled, and you probably WANT hostlist daemon])
fi
# bluetooth
then
AC_MSG_NOTICE([NOTICE: GnuTLS not found, gnunet-gns-proxy will not be built])
else
-if test x$gnutls_dane != xtrue
+if test "x$gnutls_dane" != "x1"
then
AC_MSG_NOTICE([NOTICE: GnuTLS has no DANE support, DANE validation will not be possible])
fi
Each GNUnet user should be added to the 'gnunet' group (may
require fresh login to come into effect):
- adduser $USERNAME gnunet
+ adduser USERNAME gnunet
(run the above command as root once for each of your users, replacing
-"$USERNAME" with the respective login names). If you have a global IP
+"USERNAME" with the respective login names). If you have a global IP
address, no further configuration is required.
Optionally, download and compile gnunet-gtk to get a GUI for