From aa6b402b7a240b6f55c063b021c5c211f46ec8bd Mon Sep 17 00:00:00 2001
From: Matt Messier <mmessier@grapetv.org>
Date: Sat, 12 May 2007 14:18:38 -0400
Subject: 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
---
 src/combined/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/combined')

diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 26277f99b..ed513cd4d 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -3,11 +3,11 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-if HAVE_WAVPACK
+if ENABLE_WAVPACK
 xineplug_wavpack = xineplug_wavpack.la
 endif
 
-if HAVE_LIBFLAC
+if ENABLE_LIBFLAC
 xineplug_flac = xineplug_flac.la
 endif
 
-- 
cgit v1.2.3