fixed: do not build internal libdts/liba52 if disabled (ticket #9277)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30911 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 33 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index 886f06dd3c..2a234b6513 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,7 +68,6 @@ DVDPCODECS_DIRS+=lib/libass/xbmc
 endif
 
 PAPCODECS_DIRS= \
-	xbmc/cores/paplayer/AC3Codec \
 	xbmc/cores/paplayer/ADPCMCodec \
 	xbmc/cores/paplayer/NSFCodec \
 	xbmc/cores/paplayer/timidity \
@@ -78,6 +77,11 @@ PAPCODECS_DIRS= \
 	xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU \
 	xbmc/cores/paplayer/vgmstream \
 
+ifeq (@USE_INTERNAL_LIBA52@,1)
+PAPCODECS_DIRS+= \
+	xbmc/cores/paplayer/AC3Codec
+endif
+
 ifeq (@USE_ASAP_CODEC@,1)
 PAPCODEC_DIRS+= \
 	xbmc/cores/paplayer/asap
@@ -342,7 +346,9 @@ libhdhomerun: dllloader
 libid3tag: dllloader
 	$(MAKE) -C xbmc/lib/libid3tag
 papcodecs: dllloader dvdpcodecs
+ifeq (@USE_INTERNAL_LIBA52@,1)
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
+endif
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 ifeq ($(findstring osx,$(ARCH)), osx)
 	$(MAKE) -C xbmc/cores/paplayer/FLACCodec
diff --git a/configure.in b/configure.in
index a6b985cf6a..8f21205eb6 100644
--- a/configure.in
+++ b/configure.in
@@ -730,6 +730,8 @@ if test "$use_liba52" = "yes" && "$use_external_liba52" = "yes"; then
   AC_MSG_NOTICE($external_liba52_enabled)
   USE_EXTERNAL_LIBA52=1
   AC_DEFINE([USE_EXTERNAL_LIBA52], [1], [Whether to use external liba52 library.])
+  USE_INTERNAL_LIBA52=0
+  SKIP_CONFIG_LIBA52=1
 else
   AC_MSG_NOTICE($external_liba52_disabled)
   USE_EXTERNAL_LIBA52=0
@@ -742,6 +744,8 @@ if test "$use_libdts" = "yes" && "$use_external_libdts" = "yes"; then
   AC_MSG_NOTICE($external_libdts_enabled)
   USE_EXTERNAL_LIBDTS=1
   AC_DEFINE([USE_EXTERNAL_LIBDTS], [1], [Whether to use external libdts library.])
+  USE_INTERNAL_LIBDTS=0
+  SKIP_CONFIG_LIBDTS=1
 else
   AC_MSG_NOTICE($external_libdts_disabled)
   USE_EXTERNAL_LIBDTS=0
@@ -1204,16 +1208,28 @@ fi
 if test "$use_libdts" = "yes"; then
   USE_LIBDTS_DECODER=1
   AC_DEFINE([USE_LIBDTS_DECODER], [1], [Define to 1 to enable deprecated libdts support])
+  if ! test "$USE_EXTERNAL_LIBDTS" = "1"; then
+    USE_INTERNAL_LIBDTS=1
+    SKIP_CONFIG_LIBDTS=0
+  fi
   final_message="$final_message\n  Deprecated libdts:\tYes"
 else
+  USE_INTERNAL_LIBDTS=0
+  SKIP_CONFIG_LIBDTS=1
   final_message="$final_message\n  Deprecated libdts:\tNo"
 fi
 
 if test "$use_liba52" = "yes"; then
   USE_LIBA52_DECODER=1
   AC_DEFINE([USE_LIBA52_DECODER], [1], [Define to 1 to enable deprecated liba52 support])
+  if ! test "$USE_EXTERNAL_LIBA52" = "1"; then
+    USE_INTERNAL_LIBA52=1
+    SKIP_CONFIG_LIBA52=0
+  fi
   final_message="$final_message\n  Deprecated liba52:\tYes"
 else
+  USE_INTERNAL_LIBA52=0
+  SKIP_CONFIG_LIBA52=1
   final_message="$final_message\n  Deprecated liba52:\tNo"
 fi
 
@@ -1334,8 +1350,10 @@ AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(BUILD_GOOM)
 AC_SUBST(USE_EXTERNAL_FFMPEG)
 AC_SUBST(USE_EXTERNAL_LIBA52)
+AC_SUBST(USE_INTERNAL_LIBA52)
 AC_SUBST(USE_EXTERNAL_LIBASS)
 AC_SUBST(USE_EXTERNAL_LIBDTS)
+AC_SUBST(USE_INTERNAL_LIBDTS)
 AC_SUBST(USE_EXTERNAL_LIBMPEG2)
 AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
 AC_SUBST(USE_EXTERNAL_PYTHON)
@@ -1546,7 +1564,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdts], [
       --disable-win \
       CFLAGS="-fPIC"
   fi
-], [$USE_EXTERNAL_LIBDTS])
+], [$SKIP_CONFIG_LIBDTS])
 
 XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss], [
   if test "$host_vendor" = "apple" ; then
@@ -1649,7 +1667,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/liba52], [
       --disable-al-audio \
       CFLAGS=-fPIC
   fi
-], [$USE_EXTERNAL_LIBA52])
+], [$SKIP_CONFIG_LIBA52])
 
 XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libmad], [
   if test "$host_vendor" = "apple" ; then
diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
index 2b84a6285d..339e6d2003 100644
--- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
@@ -10,10 +10,10 @@ DIRS=
 ifneq (@USE_EXTERNAL_FFMPEG@,1)
   DIRS+=ffmpeg
 endif
-ifneq (@USE_EXTERNAL_LIBA52@,1)
+ifeq (@USE_INTERNAL_LIBA52@,1)
   DIRS+=liba52
 endif
-ifneq (@USE_EXTERNAL_LIBDTS@,1)
+ifeq (@USE_INTERNAL_LIBDTS@,1)
   DIRS+=libdts
 endif
 
@@ -25,11 +25,11 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
 	postproc-51-$(ARCH).so \
 	swscale-0.6.1-$(ARCH).so
 endif
-ifneq (@USE_EXTERNAL_LIBA52@,1)
+ifeq (@USE_INTERNAL_LIBA52@,1)
   LIBS+=liba52-$(ARCH).so \
 	libao-$(ARCH).so
 endif
-ifneq (@USE_EXTERNAL_LIBDTS@,1)
+ifeq (@USE_INTERNAL_LIBDTS@,1)
   LIBS+=libdts-$(ARCH).so
 endif
 
diff --git a/xbmc/cores/paplayer/AC3Codec.h b/xbmc/cores/paplayer/AC3Codec.h
index 4c59ff18ac..40ce2a0186 100644
--- a/xbmc/cores/paplayer/AC3Codec.h
+++ b/xbmc/cores/paplayer/AC3Codec.h
@@ -21,11 +21,11 @@
  *
  */
 
+#ifdef USE_LIBA52_DECODER
+
 #include "CachingCodec.h"
 #include "DllAc3codec.h"
 
-#ifdef USE_LIBA52_DECODER
-
 class AC3Codec : public CachingCodec
 {
 public: