- formatting

[oweals/gnunet.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index dcaedc1e8fd90ab425ac8aed880463740e93006b..0aa1ec4d1cdde60cbd29d97959c32356a998ddf5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ if HAVE_EXPERIMENTAL
   scalarproduct \
   multicast \
   env \
+  psycstore \
   psyc \
   $(CONSENSUS) \
   $(SECRETSHARING) \
@@ -23,9 +24,11 @@ if HAVE_EXPERIMENTAL
 endif
 
 
-if HAVE_PULSE
-if HAVE_OPUS
-  CONVERSATION_DIR = conversation
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
 endif
 
@@ -77,7 +80,6 @@ SUBDIRS = \
   vpn \
   gns \
   $(CONVERSATION_DIR) \
-  psycstore \
   fs \
   exit \
   pt \