[GNUnet-SVN] r29784 - in gnunet: . src src/conversation src/include

[gnunet]

Author: grothoff
Date: 2013-10-02 14:54:25 +0200 (Wed, 02 Oct 2013)
New Revision: 29784

Modified:
   gnunet/README
   gnunet/configure.ac
   gnunet/src/Makefile.am
   gnunet/src/conversation/Makefile.am
   gnunet/src/include/gnunet_namestore_service.h
Log:
-add configure tests for opus/pulseaudio for conversation

Modified: gnunet/README
===================================================================
--- gnunet/README       2013-10-02 12:15:35 UTC (rev 29783)
+++ gnunet/README       2013-10-02 12:54:25 UTC (rev 29784)
@@ -51,6 +51,8 @@
 - sqlite        >= 3.0 (default database)
 - mysql         >= 5.1 (alternative to sqLite)
 - postgres      >= 8.3 (alternative to sqLite)
+- libopus       >= 0.9.14 (optional for experimental conversation tool)
+- libpulse      >= 2.0 (optional for experimental conversation tool)
 
 Recommended autotools for compiling the SVN version are:
 - autoconf >= 2.59

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-10-02 12:15:35 UTC (rev 29783)
+++ gnunet/configure.ac 2013-10-02 12:54:25 UTC (rev 29784)
@@ -360,7 +360,7 @@
 
 # check for bluetooth library
 bluetooth=0
-AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, 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)
@@ -373,7 +373,35 @@
   bluetooth=1
 fi
 
+# check for libpulse(audio) library
+pulse=0
+AC_CHECK_LIB(pulse,pa_stream_peak,
+  [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
+  pulse=0
+fi
 
+# check for libopus(audio) library
+opus=0
+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
+
+
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
 if test "$curl" = 1
@@ -1440,11 +1468,24 @@
   AC_MSG_NOTICE([NOTICE: opening ports for gnunet-java bindings by default.])
 fi
 
+# MHD
 if test "x$lmhd" != "x1"
 then
  AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be 
installed.])
 fi
 
+# Pulse Audio
+if test "x$pulse" != "x1"
+then
+ AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be 
built.])
+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])
 
 if test "$enable_framework_build" = "yes"

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-10-02 12:15:35 UTC (rev 29783)
+++ gnunet/src/Makefile.am      2013-10-02 12:54:25 UTC (rev 29784)
@@ -16,12 +16,17 @@
   multicast \
   env \
   psyc \
-  conversation \
   $(CONSENSUS) \
   $(EXPERIMENTATION)
   # NOTE: scalarproduct is not being listed here yet as the crypto is being 
reworked at the moment
+if HAVE_PULSE
+if HAVE_OPUS
+  EXP_DIR += conversation
 endif
+endif
 
+endif
+
 if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif

Modified: gnunet/src/conversation/Makefile.am
===================================================================
--- gnunet/src/conversation/Makefile.am 2013-10-02 12:15:35 UTC (rev 29783)
+++ gnunet/src/conversation/Makefile.am 2013-10-02 12:54:25 UTC (rev 29784)
@@ -31,10 +31,19 @@
 
 bin_PROGRAMS = gnunet-conversation
 
-libexec_PROGRAMS = gnunet-service-conversation \
+libexec_PROGRAMS = \
+  gnunet-service-conversation 
+
+if HAVE_PULSE
+if HAVE_OPUS
+libexec_PROGRAMS +=
   gnunet-helper-audio-record \
   gnunet-helper-audio-playback
+endif
+endif
 
+
+
 check_PROGRAMS = \
  test_conversation_api 
 

Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h       2013-10-02 12:15:35 UTC 
(rev 29783)
+++ gnunet/src/include/gnunet_namestore_service.h       2013-10-02 12:54:25 UTC 
(rev 29784)
@@ -724,7 +724,7 @@
 
 /**
  * Returns the expiration time of the given block of records. The block
- * expiration time is the expiration time of the block with smallest
+ * expiration time is the expiration time of the record with smallest
  * expiration time.
  *
  * @param rd_count number of records given in @a rd