X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=7aea4d12e2838263eb558d93a8297dea1d067f47;hb=950b763d1bfd5eed2ff4d1105ab9e170be87017f;hp=d9e09ae9a9972f349201b5880655ab3a6ba4993e;hpb=93f8727807901fa03fef40f795a51842799e74ea;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index d9e09ae9a..7aea4d12e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
+# by the Free Software Foundation; either version 3, or (at your
 # option) any later version.
 #
 # GNUnet is distributed in the hope that it will be useful, but
@@ -22,7 +22,7 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.9.5a], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.10.0], [bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -75,7 +75,7 @@ case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
      AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system])
      CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS"
-     CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
+     CFLAGS="-fno-common $CFLAGS"
      AC_MSG_WARN([The VPN application cannot be compiled on your OS])
      build_target="darwin"
      DEFAULT_INTERFACE="\"en0\""
@@ -203,6 +203,15 @@ AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(m, log)
 AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported]))
 
+
+AC_CHECK_MEMBER(struct tm.tm_gmtoff,
+  [AC_DEFINE(HAVE_TM_GMTOFF, 1,
+     [Define if struct tm has the tm_gmtoff member.])],
+     ,
+     [#include <time.h>])
+
+AC_CHECK_DECLS([_stati64])
+
 # 'save' libs; only those libs found so far will be
 # linked against _everywhere_.  For the others, we
 # will be more selective!
@@ -223,7 +232,7 @@ NEED_LIBGCRYPT_VERSION=1.6.0
 
 
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
-AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
+AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include <gcrypt.h>]])
 
 if test $gcrypt = 0
 then
@@ -379,10 +388,7 @@ AC_CHECK_LIB(pulse,pa_stream_peek,
   [AC_CHECK_HEADER([pulse/simple.h],pulse=1)])
 if test "$pulse" = 1
 then
-  AM_CONDITIONAL(HAVE_PULSE, true)
   AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
-else
-  AM_CONDITIONAL(HAVE_PULSE, false)
 fi
 if test "$build_target" = "mingw"
 then
@@ -395,15 +401,42 @@ AC_CHECK_LIB(opus,opus_decode_float,
   [AC_CHECK_HEADER([opus/opus.h],opus=1)])
 if test "$opus" = 1
 then
-  AM_CONDITIONAL(HAVE_OPUS, true)
   AC_DEFINE([HAVE_OPUS],[1],[Have libopus library])
-else
-  AM_CONDITIONAL(HAVE_OPUS, false)
 fi
 
+gst=0
+PKG_CHECK_MODULES(
+  [GST],
+  [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0],
+  [
+    gst=1
+    AC_MSG_RESULT(ok)
+  ], [
+    gst=0
+    AC_MSG_RESULT(not found)
+  ])
+
+# Pulse Audio
+if test "x$pulse" != "x1" -o "x$opus" != "x1"
+then
+ if test "x$gst" != "x1" -o "x$opus" != "x1"
+ then
+  conversation_backend=none
+  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)
+ fi
+else
+ conversation_backend=pulse
+ AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
+ AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+fi
 
 # libgnurl
-LIBGNURL_CHECK_CONFIG(,7.33.0,gnurl=1,gnurl=0)
+LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
 if test "$gnurl" = 1
 then
 	AM_CONDITIONAL(HAVE_LIBGNURL, true)
@@ -561,7 +594,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 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 netinet/in_systm.h netinet/ip.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 endian.h sys/endian.h execinfo.h])
+AC_CHECK_HEADERS([malloc.h malloc/malloc.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 netinet/in_systm.h netinet/ip.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])
 
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
@@ -870,28 +903,6 @@ AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgrou
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-gn_user_home_dir="~/.gnunet"
-AC_ARG_WITH(user-home-dir,
-        AC_HELP_STRING(
-                [--with-user-home-dir=DIR],
-                [default user home directory (~/.gnunet)]),
-        [gn_user_home_dir=$withval])
-AC_SUBST(GN_USER_HOME_DIR, $gn_user_home_dir)
-gn_daemon_home_dir="/var/lib/gnunet"
-AC_ARG_WITH(daemon-home-dir,
-        AC_HELP_STRING(
-                [--with-daemon-home-dir=DIR],
-                [default daemon home directory (/var/lib/gnunet)]),
-        [gn_daemon_home_dir=$withval])
-AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir)
-gn_daemon_config_dir="/etc"
-AC_ARG_WITH(daemon-config-dir,
-        AC_HELP_STRING(
-                [--with-daemon-config-dir=DIR],
-                [default daemon config directory (/etc)]),
-        [gn_daemon_config_dir=$withval])
-AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir)
-
 GN_INTLINCL=""
 GN_LIBINTL="$LTLIBINTL"
 AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework build helpers],enable_framework_build=$enableval)
@@ -1037,8 +1048,8 @@ 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=true))
-AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = xtrue)
+	     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])
 
 
@@ -1158,6 +1169,25 @@ AC_ARG_ENABLE([experimental],
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
+# should services be started by default when a peer starts?  Some services may
+# choose to never start by default and it is upto the service/module developer to
+# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART" in
+# the service/module's conf.in file.
+AUTOSTART="YES"
+AC_MSG_CHECKING(whether to auto-start peer's services by default)
+AC_ARG_ENABLE([autostart],
+   [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])],
+   [enable_autostart=${enableval}
+    if test "x$enable_autostart" == "xno"
+    then
+        AUTOSTART="NO"
+    fi
+   ],
+   [enable_autostart=yes])
+AC_MSG_RESULT($enable_autostart)
+#AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"])
+AC_SUBST(AUTOSTART)
+
 # should memory statistics be kept (very expensive CPU-wise!)
 AC_MSG_CHECKING(whether to create expensive statistics on memory use)
 AC_ARG_ENABLE([heapstats],
@@ -1308,16 +1338,16 @@ AS_IF([test "X$svn_version" = "X" -o "X$svn_version" = "Xexported" -o "X$svn_ver
   AS_IF([test "X$gitsvn_version" = "X"],
   [
     vcs_name="no"
-    vcs_version="release"
+    vcs_version="\"release\""
   ],
   [
     vcs_name="yes, git-svn"
-    vcs_version="svn-$gitsvn_version"
+    vcs_version="\"svn-r$gitsvn_version\""
   ])
 ],
 [
   vcs_name="yes, svn"
-  vcs_version="svn-$svn_version"
+  vcs_version="\"svn-r$svn_version\""
 ])
 AC_MSG_RESULT($vcs_name)
 
@@ -1371,7 +1401,6 @@ src/hello/Makefile
 src/identity/Makefile
 src/identity/identity.conf
 src/include/Makefile
-src/include/gnunet_directories.h
 src/integration-tests/Makefile
 src/hostlist/Makefile
 src/mesh/Makefile
@@ -1514,17 +1543,23 @@ then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])
 fi
 
-# Pulse Audio
-if test "x$pulse" != "x1"
+# conversation
+if test "x$conversation_backend" == "xnone"
 then
- AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.])
+  if test "x$pulse" != "x1"
+  then
+    AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.])
+  fi
+  if test "x$opus" != "x1"
+  then
+   AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.])
+  fi
+  if test "x$gst" != "x1"
+  then
+   AC_MSG_NOTICE([NOTICE: GStreamer not found, conversation will not be built.])
+  fi
 fi
 
-# Opus
-if test "x$opus" != "x1"
-then
- AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.])
-fi
 
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres])