From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 23 Aug 2019 07:49:34 +0000 (+0200)
Subject: fix #5829
X-Git-Tag: v0.11.7~176
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=839005f05580cd4ac00c68ab7bcb93de3817fdec;p=oweals%2Fgnunet.git

fix #5829
---

diff --git a/configure.ac b/configure.ac
index 4ab537b31..330b02875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -763,6 +763,10 @@ AS_IF([test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"],[
  AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
 ])
 
+AS_IF([test "x$conversation_backend" = "xnone"],
+      AM_CONDITIONAL(BUILD_CONVERSATION, false),
+      AM_CONDITIONAL(BUILD_CONVERSATION, true))
+
 # libgnurl
 LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 13cca2adc..217aea54f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,14 +36,6 @@ endif
 endif
 endif
 
-if BUILD_PULSE_HELPERS
-CONVERSATION_DIR = conversation
-else
-if BUILD_GST_HELPERS
-CONVERSATION_DIR = conversation
-endif
-endif
-
 if HAVE_SQLITE
  SQLITE_DIR = sq
 endif
@@ -117,7 +109,7 @@ SUBDIRS = \
   vpn \
   gns \
   zonemaster \
-  $(CONVERSATION_DIR) \
+  conversation \
   fs \
   exit \
   pt \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index cbffc3283..6ad6f68f6 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -12,11 +12,27 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)
 
+if BUILD_CONVERSATION
 lib_LTLIBRARIES = \
  libgnunetmicrophone.la \
  libgnunetspeaker.la \
  libgnunetconversation.la
 
+bin_PROGRAMS = \
+ gnunet-conversation-test \
+ gnunet-conversation
+
+libexec_PROGRAMS = \
+  gnunet-service-conversation
+
+check_PROGRAMS = \
+ test_conversation_api \
+ test_conversation_api_reject \
+ test_conversation_api_twocalls
+
+pkgcfg_DATA = conversation.conf
+endif
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -67,18 +83,6 @@ libgnunetconversation_la_LDFLAGS = \
   -version-info 0:0:0
 
 
-bin_PROGRAMS = \
- gnunet-conversation-test \
- gnunet-conversation
-
-libexec_PROGRAMS = \
-  gnunet-service-conversation
-
-check_PROGRAMS = \
- test_conversation_api \
- test_conversation_api_reject \
- test_conversation_api_twocalls
-
 if BUILD_PULSE_HELPERS
 AUDIO_HELPER_RECD=gnunet-helper-audio-record
 AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
@@ -255,6 +259,5 @@ test_conversation_api_reject_LDFLAGS = \
  $(WINFLAGS) -export-dynamic
 
 
- pkgcfg_DATA = conversation.conf
 
 EXTRA_DIST = test_conversation.conf