-add configure tests for opus/pulseaudio for conversation

5 files changed, 61 insertions, 4 deletions

diff --git a/README b/README
index 48e1af638..76bc39003 100644
--- a/README
+++ b/README
@@ -51,6 +51,8 @@ These are the direct dependencies for running GNUnet:
 - 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
diff --git a/configure.ac b/configure.ac
index c2d9bbcb5..79e64ca5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,7 +360,7 @@ fi	# $build = $target
 
 # 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,6 +373,34 @@ then
   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)
@@ -1440,11 +1468,24 @@ then
   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"
diff --git a/src/Makefile.am b/src/Makefile.am
index bd039325a..97b643f5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,10 +16,15 @@ if HAVE_EXPERIMENTAL
   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
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index de5c5ace7..b5dc0d49b 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -31,9 +31,18 @@ libgnunetconversation_la_LDFLAGS = \
 
 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 
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 640bd6c02..4b3a6fcb9 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -724,7 +724,7 @@ GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a,
 
 /**
  * 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