diff options
| author | Rocky Bernstein <rockyb@users.sourceforge.net> | 2003-10-30 07:58:52 +0000 |
|---|---|---|
| committer | Rocky Bernstein <rockyb@users.sourceforge.net> | 2003-10-30 07:58:52 +0000 |
| commit | a2749eea9943f5efef2a067b6240faa533efda2c (patch) | |
| tree | 83ada22e6ed27a2efd46096fb6917c2581e9497e /src | |
| parent | c91925fe44578548540be47d36d3d1491aef520e (diff) | |
| download | xine-lib-a2749eea9943f5efef2a067b6240faa533efda2c.tar.gz xine-lib-a2749eea9943f5efef2a067b6240faa533efda2c.tar.bz2 | |
- More VCDX -> VCD
- Prefer external libcdio and libvcdinfo libraries when they are acceptable
- Allow disabling VCD plugin
CVS patchset: 5644
CVS date: 2003/10/30 07:58:52
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/vcd/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/vcd/libvcd/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 2db1621f6..0645e9173 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -19,7 +19,7 @@ libdir = $(XINE_PLUGINDIR) if HAVE_CDROM_IOCTLS in_dvd = xineplug_inp_dvd.la ## build both vcd for now -##if ENABLE_VCDX +##if ENABLE_VCD ##else in_vcd = xineplug_inp_vcdo.la ##endif diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index d995a9158..deb30e78f 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -8,7 +8,7 @@ vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c EXTRA_DIST = $(vcd_SRCS) -if ENABLE_VCDX +if ENABLE_VCD lib_LTLIBRARIES = xineplug_inp_vcd.la AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am index ee975a0c3..636c734f7 100644 --- a/src/input/vcd/libcdio/Makefile.am +++ b/src/input/vcd/libcdio/Makefile.am @@ -29,7 +29,7 @@ libiso9660_SRCS = \ EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS) -if ENABLE_VCDX +if ENABLE_VCD if HAVE_VCDNAV else noinst_LTLIBRARIES = libcdio.la libiso9660.la diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am index 480cf0d8b..a4138bf8b 100644 --- a/src/input/vcd/libvcd/Makefile.am +++ b/src/input/vcd/libvcd/Makefile.am @@ -31,7 +31,7 @@ libvcdinfo_SRCS = \ EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS) -if ENABLE_VCDX +if ENABLE_VCD if HAVE_VCDNAV else noinst_LTLIBRARIES = libvcd.la libvcdinfo.la |