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

4 files changed, 5 insertions, 8 deletions

diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index 414e6764f..02eddc00a 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -16,9 +16,7 @@ noinst_HEADERS = \
 	DS_Filter.h \
 	DS_VideoDecoder.h
 
-if HAVE_W32DLL
 noinst_LTLIBRARIES = libds_filter.la
-endif
 
 libds_filter_la_SOURCES = \
 	allocator.c \
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 94dae4ab9..7d11bb2dc 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -4,13 +4,16 @@ AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\"
 AM_LDFLAGS  = $(xineplug_ldflags)
 
-SUBDIRS = wine DirectShow dmo qtx
+SUBDIRS = 
+if ENABLE_W32DLL
+SUBDIRS += wine DirectShow dmo qtx
+endif
 
 EXTRA_DIST = common.c
 
 noinst_HEADERS = libwin32.h w32codec.h
 
-if HAVE_W32DLL
+if ENABLE_W32DLL
 xineplug_LTLIBRARIES = xineplug_decode_w32dll.la xineplug_decode_qt.la
 endif
 
diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am
index 663e179a9..56bfc8f34 100644
--- a/src/libw32dll/dmo/Makefile.am
+++ b/src/libw32dll/dmo/Makefile.am
@@ -12,9 +12,7 @@ noinst_HEADERS = \
 	dmo.h \
 	DMO_VideoDecoder.h
 
-if HAVE_W32DLL
 noinst_LTLIBRARIES = libdmo_filter.la
-endif
 
 libdmo_filter_la_SOURCES = \
 	buffer.c \
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index b9a28a151..1756e3262 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -47,9 +47,7 @@ noinst_HEADERS = \
 	winuser.h \
 	wrapper.h
 
-if HAVE_W32DLL
 noinst_LTLIBRARIES = libwine.la
-endif
 
 libwine_la_SOURCES = \
 	afl.c \