-fixes to build system, integrating conversation in non-experimental builds

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 97b643f5c..a43f1b865 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,14 +19,15 @@ if HAVE_EXPERIMENTAL
   $(CONSENSUS) \
   $(EXPERIMENTATION)
   # NOTE: scalarproduct is not being listed here yet as the crypto is being reworked at the moment
+endif
+
+
 if HAVE_PULSE
 if HAVE_OPUS
-  EXP_DIR += conversation
+  CONVERSATION_DIR = conversation
 endif
 endif
 
-endif
-
 if HAVE_MYSQL
  MYSQL_DIR = mysql
 endif
@@ -73,6 +74,7 @@ SUBDIRS = \
   namestore \
   vpn \
   gns \
+  $(CONVERSATION_DIR) \
   psycstore \
   fs \
   exit \