From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 19 Dec 2012 21:32:55 +0000 (+0000)
Subject: Issue #1446 - fix --disable-cwc checks.
X-Git-Tag: v3.5~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9dae65bbb77534bf283d4c4487ae051343d3caa;p=thirdparty%2Ftvheadend.git

Issue #1446 - fix --disable-cwc checks.
---

diff --git a/Makefile b/Makefile
index 8c6b29364..6e4edae06 100644
--- a/Makefile
+++ b/Makefile
@@ -177,8 +177,10 @@ SRCS-${CONFIG_CWC} += src/cwc.c \
 ifneq ($(CONFIG_DVBCSA),yes)
 SRCS-${CONFIG_CWC}  += src/ffdecsa/ffdecsa_interface.c \
 	src/ffdecsa/ffdecsa_int.c
+ifeq ($(CONFIG_CWC),yes)
 SRCS-${CONFIG_MMX}  += src/ffdecsa/ffdecsa_mmx.c
 SRCS-${CONFIG_SSE2} += src/ffdecsa/ffdecsa_sse2.c
+endif
 ${BUILDDIR}/src/ffdecsa/ffdecsa_mmx.o  : CFLAGS += -mmmx
 ${BUILDDIR}/src/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2
 endif
diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c
index 529f5c505..7396e6e3c 100644
--- a/src/dvb/dvb_tables.c
+++ b/src/dvb/dvb_tables.c
@@ -534,7 +534,9 @@ static int
 dvb_ca_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
 		uint8_t tableid, void *opaque)
 {
+#if ENABLE_CWC
   cwc_emm(ptr, len, (uintptr_t)opaque, (void *)tdmi);
+#endif
   return 0;
 }
 
diff --git a/src/main.c b/src/main.c
index 43459ad7c..0a6a199c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -470,9 +470,13 @@ main(int argc, char **argv)
 
   serviceprobe_init();
 
+#if ENABLE_CWC
   cwc_init();
-
   capmt_init();
+#if (!ENABLE_DVBCSA)
+  ffdecsa_init();
+#endif
+#endif
 
   epggrab_init();
   epg_init();
@@ -481,10 +485,6 @@ main(int argc, char **argv)
 
   htsp_init();
 
-#if (!ENABLE_DVBCSA)
-  ffdecsa_init();
-#endif
-
   if(rawts_input != NULL)
     rawts_init(rawts_input);
 
diff --git a/src/service.c b/src/service.c
index e189ae1d9..c745527a6 100644
--- a/src/service.c
+++ b/src/service.c
@@ -208,8 +208,10 @@ service_start(service_t *t, unsigned int weight, int force_start)
   if((r = t->s_start_feed(t, weight, force_start)))
     return r;
 
+#if ENABLE_CWC
   cwc_service_start(t);
   capmt_service_start(t);
+#endif
 
   pthread_mutex_lock(&t->s_stream_mutex);