X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=93795211755457da7c97d86ad37e8e8d5117350e;hb=28be5532ee5872b181157272aaa3c8bf7f4b836c;hp=fcec00df0c64fddd6d3ecdca644acfae611831f4;hpb=13f63dab5a87cb8b95b8d77f11925a7c7429038b;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index fcec00df0..937952117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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\""
@@ -138,7 +138,6 @@ linux*)
      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
@@ -151,7 +150,7 @@ linux*)
      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"
@@ -210,6 +209,8 @@ AC_CHECK_MEMBER(struct tm.tm_gmtoff,
      ,
      [#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!
@@ -386,10 +387,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
@@ -399,18 +397,63 @@ fi
 # check for libopus(audio) library
 opus=0
 AC_CHECK_LIB(opus,opus_decode_float,
-  [AC_CHECK_HEADER([opus/opus.h],opus=1)])
+  [AC_CHECK_HEADER([opus/opus.h],
+    [AC_CHECK_DECL([OPUS_SET_GAIN],[opus=1],[],[[#include <opus/opus.h>]]
+    )]
+  )]
+)
 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
 
+# 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],
+  [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" -o "x$ogg" != "x1"
+then
+ if test "x$gst" != "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)
@@ -430,11 +473,14 @@ if test "$libidn" != "no"; then
      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)
 
@@ -568,7 +614,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
@@ -990,6 +1036,7 @@ AC_SUBST(GNUNETDNS_GROUP)
 
 # gnutls
 gnutls=0
+gnutls_dane=0
 AC_MSG_CHECKING(for gnutls)
 AC_ARG_WITH(gnutls,
    [  --with-gnutls=PFX   base of gnutls installation],
@@ -1001,6 +1048,9 @@ AC_ARG_WITH(gnutls,
         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"
@@ -1009,21 +1059,24 @@ AC_ARG_WITH(gnutls,
             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=true))
-AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = xtrue)
+AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support])
 
 
@@ -1486,6 +1539,7 @@ fi
 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
@@ -1499,7 +1553,7 @@ if test x$gnutls != xtrue
 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
@@ -1517,17 +1571,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])
 
@@ -1558,9 +1618,9 @@ to install everything.
 
 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