summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2005-06-29 15:36:27 +0000
committerAndy Wingo <wingo@pobox.com>2005-06-29 15:36:27 +0000
commite5e90dffb698d311639f8b3b3b1a4c6567ca3ec6 (patch)
treede122e46e2d446de0ba878975e512fa2b12abb83
parent72456f25612614efa2a7d1eaa4a22e516e47460a (diff)
downloadgst-plugins-bad-e5e90dffb698d311639f8b3b3b1a4c6567ca3ec6.tar.gz
gst-plugins-bad-e5e90dffb698d311639f8b3b3b1a4c6567ca3ec6.tar.bz2
gst-plugins-bad-e5e90dffb698d311639f8b3b3b1a4c6567ca3ec6.zip
ext/Makefile.am (MAD_DIR): Add mad to the build.
Original commit message from CVS: 2005-06-29 Andy Wingo <wingo@pobox.com> * ext/Makefile.am (MAD_DIR): Add mad to the build.
-rw-r--r--ChangeLog4
m---------common0
-rw-r--r--ext/Makefile.am8
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 374fcd3f..bfb5d090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29 Andy Wingo <wingo@pobox.com>
+
+ * ext/Makefile.am (MAD_DIR): Add mad to the build.
+
2005-06-28 Wim Taymans <wim@fluendo.com>
* ext/mad/gstid3tag.c: (gst_id3_tag_src_link):
diff --git a/common b/common
-Subproject d6e46b214fac0ecb46010ff522af2f7653e1c18
+Subproject 2826306411790bf8aa9298922aa59b126897431
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 66bf728e..5a9ae56d 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