From e5e90dffb698d311639f8b3b3b1a4c6567ca3ec6 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 29 Jun 2005 15:36:27 +0000 Subject: [PATCH] ext/Makefile.am (MAD_DIR): Add mad to the build. Original commit message from CVS: 2005-06-29 Andy Wingo * ext/Makefile.am (MAD_DIR): Add mad to the build. --- ChangeLog | 4 ++++ common | 2 +- ext/Makefile.am | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 374fcd3f64..bfb5d090e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-29 Andy Wingo + + * ext/Makefile.am (MAD_DIR): Add mad to the build. + 2005-06-28 Wim Taymans * ext/mad/gstid3tag.c: (gst_id3_tag_src_link): diff --git a/common b/common index d6e46b214f..2826306411 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d6e46b214fac0ecb46010ff522af2f7653e1c18e +Subproject commit 2826306411790bf8aa9298922aa59b126897431f diff --git a/ext/Makefile.am b/ext/Makefile.am index 66bf728e7c..5a9ae56d9b 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -226,11 +226,11 @@ LIBVISUAL_DIR= LIBMMS_DIR= # endif -# if USE_MAD -# MAD_DIR=mad -# else +if USE_MAD +MAD_DIR=mad +else MAD_DIR= -# endif +endif # if USE_MIKMOD # MIKMOD_DIR=mikmod