From 7c9b436f8f40aa3f2f75bf2ecad543758d897330 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 8 Mar 2009 16:33:02 +0000
Subject: Enable libmpeg2new only if configured with --enable-libmpeg2new.

---
 ChangeLog                            | 4 ++--
 configure.ac                         | 4 ++++
 src/libmpeg2new/Makefile.am          | 6 +++++-
 src/libmpeg2new/libmpeg2/Makefile.am | 6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f0d49954..b79f283f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 xine-lib (1.1.17) 2009-??-??
-  * Enable libmpeg2new. This is not yet production code; the old mpeg2
-    decoder remains the default.
+  * Enable libmpeg2new (if configured with --enable-libmpeg2new).
+    This is not yet production code; the old mpeg2 decoder remains the default.
   * Add support for OpenBSD.
   * Fix a build failure on *BSD due to some rather useful GNUisms.
   * Protect audio loop so it cannot write to a paused device (fix
diff --git a/configure.ac b/configure.ac
index c822e17a0..102081e58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,6 +323,10 @@ dnl ---------------------------------------------
 
 AC_SUBST(LIBMPEG2_CFLAGS)
 
+AC_ARG_ENABLE([libmpeg2new],
+	AS_HELP_STRING([--enable-libmpeg2new], [build the newer MPEG2 decoder (buggy)]))
+AM_CONDITIONAL(ENABLE_MPEG2NEW, test "x$enable_libmpeg2new" = "xyes")
+
 AC_ARG_WITH([external-ffmpeg], AS_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
 
 case "x$with_external_ffmpeg" in
diff --git a/src/libmpeg2new/Makefile.am b/src/libmpeg2new/Makefile.am
index a91e5bea6..8b05a5444 100644
--- a/src/libmpeg2new/Makefile.am
+++ b/src/libmpeg2new/Makefile.am
@@ -3,7 +3,11 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = include libmpeg2
 
-xineplug_LTLIBRARIES = xineplug_decode_mpeg2new.la
+if ENABLE_MPEG2NEW
+mpeg2new_module = xineplug_decode_mpeg2new.la
+endif
+
+xineplug_LTLIBRARIES = $(mpeg2new_module)
 
 xineplug_decode_mpeg2new_la_SOURCES = \
 	xine_mpeg2new_decoder.c
diff --git a/src/libmpeg2new/libmpeg2/Makefile.am b/src/libmpeg2new/libmpeg2/Makefile.am
index 760505a51..0bfeda1ce 100644
--- a/src/libmpeg2new/libmpeg2/Makefile.am
+++ b/src/libmpeg2new/libmpeg2/Makefile.am
@@ -1,6 +1,10 @@
 include $(top_srcdir)/misc/Makefile.common
 
-noinst_LTLIBRARIES = libmpeg2.la libmpeg2arch.la
+if ENABLE_MPEG2NEW
+mpeg2new_libs = libmpeg2.la libmpeg2arch.la
+endif
+
+noinst_LTLIBRARIES = $(mpeg2new_libs)
 
 libmpeg2_la_SOURCES = alloc.c header.c decode.c slice.c motion_comp.c idct.c
 libmpeg2_la_LIBADD = libmpeg2arch.la
-- 
cgit v1.2.3