From d6f1a66d60f33cece488cf9ca30307564b14f508 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Sun, 19 Oct 2003 12:01:47 +0000
Subject: build both vcd plugins

CVS patchset: 5541
CVS date: 2003/10/19 12:01:47
---
 configure.ac          | 7 ++++++-
 src/input/Makefile.am | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 60dde40e8..4a09115fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -979,7 +979,12 @@ AM_CONDITIONAL(HAVE_DVDNAV, [test x"$no_dvdnav" != "xyes"])
 dnl ---------------------------------------------
 dnl VCDx
 dnl ---------------------------------------------
-AC_ARG_ENABLE(vcdx,[  --disable-vcdx       Do not compile VCDX plugin. Compile old VCD instead], enable_vcdx=no, enable_vcdx=yes)
+dnl
+dnl AC_ARG_ENABLE(vcdx,[  --disable-vcdx       Do not compile VCDX plugin. Compile old VCD instead], enable_vcdx=no, enable_vcdx=yes)
+dnl
+dnl Force build of both vcd plugins, for now.
+enable_vcdx="yes"
+
 AC_ARG_WITH(external-vcdnav,[  --with-external-vcdnav  Use external libcdio/libvcd libraries [[not recommended]]],
             [external_vcdnav="yes"], [no_vcdnav="yes"; external_vcdnav="no"])
 
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 20f76e65c..6a35b3c1f 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -18,10 +18,11 @@ libdir = $(XINE_PLUGINDIR)
 
 if HAVE_CDROM_IOCTLS
 in_dvd = xineplug_inp_dvd.la
-if ENABLE_VCDX
-else
+## build both vcd for now
+##if ENABLE_VCDX
+##else
 in_vcd = xineplug_inp_vcd.la
-endif
+##endif
 #in_cda = xineplug_inp_cda.la
 endif
 
-- 
cgit v1.2.3