Moving MAS plugin back to gst-sandbox module.

Original commit message from CVS:
Moving MAS plugin back to gst-sandbox module.

diff --git a/configure.ac b/configure.ac
index 0992c4a..6f10f53 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1209,12 +1209,12 @@ AC_SUBST(LAME_CFLAGS)
 AC_SUBST(LAME_LIBS)
 
 dnl *** MAS (TODO) ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_MAS, true)
-GST_CHECK_FEATURE(MAS, [mas], mas, [
-   GST_CHECK_CONFIGPROG(MAS, mas-config)
-   AC_SUBST(MAS_CFLAGS)
-   AC_SUBST(MAS_LIBS)
-])
+dnl translit(dnm, m, l) AM_CONDITIONAL(USE_MAS, true)
+dnl GST_CHECK_FEATURE(MAS, [mas], mas, [
+dnl   GST_CHECK_CONFIGPROG(MAS, mas-config)
+dnl   AC_SUBST(MAS_CFLAGS)
+dnl   AC_SUBST(MAS_LIBS)
+dnl ])
 
 dnl *** libcaca ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
@@ -1962,7 +1962,7 @@ ext/libpng/Makefile
 ext/librfb/Makefile
 ext/libvisual/Makefile
 ext/mad/Makefile
-ext/mas/Makefile
+dnl ext/mas/Makefile
 ext/mikmod/Makefile
 ext/mpeg2dec/Makefile
 ext/mpeg2enc/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 20f7993..41a029c 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -226,11 +226,11 @@ else
 MPLEX_DIR=
 endif
 
-if USE_MAS
-MAS_DIR=mas
-else
-MAS_DIR=
-endif
+#if USE_MAS
+#MAS_DIR=mas
+#else
+#MAS_DIR=
+#endif
 
 if USE_MUSICBRAINZ
 MUSICBRAINZ_DIR=musicbrainz
@@ -387,7 +387,6 @@ SUBDIRS=\
        $(LIBRFB_DIR) \
        $(LIBVISUAL_DIR) \
        $(MAD_DIR) \
-       $(MAS_DIR) \
        $(MIKMOD_DIR) \
        $(MPEG2DEC_DIR) \
        $(MPEG2ENC_DIR) \
@@ -451,7 +450,6 @@ DIST_SUBDIRS=\
        mpeg2dec \
        mpeg2enc \
        mplex \
-       mas \
        musicbrainz \
        nas \
        ogg \