-add configure tests for opus/pulseaudio for conversation

3 files changed, 17 insertions, 3 deletions

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