From 90bee57f2a722b3c97ad38dcc58ab26a85476aff Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Date: Thu, 30 Jan 2003 20:24:25 +0000 Subject: [PATCH] The first attempt to support MAS. Dont expect it to work :) Original commit message from CVS: The first attempt to support MAS. Dont expect it to work :) --- configure.ac | 10 ++++++++++ ext/Makefile.am | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 675d17bfbc..4ae65d840d 100644 --- a/configure.ac +++ b/configure.ac @@ -497,6 +497,15 @@ GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [ AS_SCRUB_INCLUDE(DVDNAV_CFLAGS) ]) +dnl *** MAS *** +translit(dnm, m, l) AM_CONDITIONAL(USE_MAS, true) +GST_CHECK_FEATURE(MAS, [mas library], massink, [ + translit(dnm, m, l) AC_SUBST(MAS_LIBS) + translit(dnm, m, l) AC_SUBST(MAS_CFLAGS) + GST_CHECK_CONFIGPROG(MAS, mas-config) + AS_SCRUB_INCLUDE(MAS_CFLAGS) +]) + dnl **** ESound **** translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true) GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink esdmon, [ @@ -1097,6 +1106,7 @@ ext/lcs/Makefile ext/libfame/Makefile ext/libpng/Makefile ext/mad/Makefile +ext/mas/Makefile ext/mikmod/Makefile ext/mjpegtools/Makefile ext/mpeg2dec/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index d31f7fe615..0d107fc559 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -64,6 +64,12 @@ else ESD_DIR= endif +if USE_MAS +MAS_DIR=mas +else +MAS_DIR= +endif + ## if USE_FESTIVAL ## FESTIVAL_DIR=festival ## else @@ -253,7 +259,7 @@ endif SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) \ - $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ + $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) $(MAS_DIR) \ $(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \ @@ -268,7 +274,7 @@ DIST_SUBDIRS=\ a52dec aalib alsa \ arts artsd avifile \ audiofile cdparanoia dv \ - dvdread dvdnav esd ffmpeg \ + dvdread dvdnav esd mas ffmpeg \ flac gnomevfs gsm \ hermes http jack jpeg \ ladspa lame lcs libfame libpng \