Don't bother with mux/ and stream_out/ is sout is disabled

diff --git a/configure.ac b/configure.ac
index 1a9514ca99eab127ad0a304169f00d3fc668b9ba..b76426ded9013e69ce4e96a6f100f04a61b80dab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1762,6 +1762,7 @@ then
 
   AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
 fi
+AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
 
 AC_ARG_ENABLE(switcher,
   [  --enable-switcher       Stream-out switcher plugin (default disabled)])

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 9a19d31306ab9f7fab3fea6aa4ba1d07c332482c..42891884474c908c5e0fa799caab2bc647451a82 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,14 +11,20 @@ SUBDIRS = \
        gui \
        meta_engine \
        misc \
-       mux \
        packetizer \
        services_discovery \
-       stream_out \
        video_chroma \
        video_filter \
        video_output \
        visualization
+EXTRA_SUBDIRS = \
+       mux \
+       stream_out
+if ENABLE_SOUT
+SUBDIRS += mux stream_out
+endif
+
+DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
 
 dist_noinst_SCRIPTS = genmf list.sh
 dist_noinst_DATA = LIST