summaryrefslogtreecommitdiff
path: root/src/input/vcd
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-12 14:18:38 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-12 14:18:38 -0400
commitaa6b402b7a240b6f55c063b021c5c211f46ec8bd (patch)
treea4c14e2633b549f8d2ffe3d1bef9363a4c771cb3 /src/input/vcd
parent67b0ebb21185cb8ea2972dead6870bab8306724e (diff)
downloadxine-lib-aa6b402b7a240b6f55c063b021c5c211f46ec8bd.tar.gz
xine-lib-aa6b402b7a240b6f55c063b021c5c211f46ec8bd.tar.bz2
More configure/Makefile cleanups
-- Make a pass at cleaning up contrib/ Makefile.am files -- Rename many AM_CONDITIONALS for consistency and give them better names to better indicate what they mean -- Remove some dead input plugin tests -- Clean up AM_PATH_DVDNAV
Diffstat (limited to 'src/input/vcd')
-rw-r--r--src/input/vcd/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 28f6290fd..0ff664605 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
AM_LDFLAGS = $(xineplug_ldflags)
SUBDIRS =
-if !HAVE_VCDNAV
+if !WITH_EXTERNAL_VCDLIBS
SUBDIRS += libcdio libvcd
endif
@@ -14,7 +14,7 @@ xineplug_LTLIBRARIES = xineplug_inp_vcd.la
xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
-if HAVE_VCDNAV
+if WITH_EXTERNAL_VCDLIBS
xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS)
else
xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm