summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-10-19 12:01:47 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-10-19 12:01:47 +0000
commitd6f1a66d60f33cece488cf9ca30307564b14f508 (patch)
tree48af8384b4a0ef758a15d81a23ad1098e74b748a
parentd173a3489b5a2ec802c508dc1fd4c5803b714008 (diff)
downloadxine-lib-d6f1a66d60f33cece488cf9ca30307564b14f508.tar.gz
xine-lib-d6f1a66d60f33cece488cf9ca30307564b14f508.tar.bz2
build both vcd plugins
CVS patchset: 5541 CVS date: 2003/10/19 12:01:47
-rw-r--r--configure.ac7
-rw-r--r--src/input/Makefile.am7
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