diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-23 14:29:43 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-23 14:29:43 +0000 |
| commit | a784168b8ce7eaf5774c572e8ee12c5b8d86ffd2 (patch) | |
| tree | 346a9f8e82d81b62712f9ae37cce50b70c87d881 | |
| parent | 56f271163b03535bec01c8978818ca8c41e25968 (diff) | |
added hermes
Original commit message from CVS:
added hermes
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | ext/Makefile.am | 16 |
2 files changed, 20 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a5dc6002..531b70b0 100644 --- a/configure.ac +++ b/configure.ac @@ -473,9 +473,10 @@ GST_CHECK_CONFIGPROG(GNOME_VFS, gnome-config vfs) ]) dnl *** gsm *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LIBGSM, true) -GST_CHECK_FEATURE(LIBGSM, [GSM library], gsmenc gsmdec, [ -GST_CHECK_LIBHEADER(LIBGSM, gsm, gsm_create, , gsm/gsm.h, LIBGSM_LIBS="-lgsm") +translit(dnm, m, l) AM_CONDITIONAL(USE_GSM, true) +GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [ + GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm/gsm.h, GSM_LIBS="-lgsm") + AC_SUBST(GSM_LIBS) ]) dnl *** Hermes *** @@ -1076,6 +1077,8 @@ ext/cdparanoia/Makefile ext/dvdread/Makefile ext/esd/Makefile ext/flac/Makefile +ext/gsm/Makefile +ext/hermes/Makefile ext/lame/Makefile ext/mad/Makefile ext/mpeg2dec/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 83000f83..e981f57f 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -52,12 +52,24 @@ endif FESTIVAL_DIR= ## endif +if USE_GSM +GSM_DIR=gsm +else +GSM_DIR= +endif + if USE_FLAC FLAC_DIR=flac else FLAC_DIR= endif +if USE_HERMES +HERMES_DIR=hermes +else +HERMES_DIR= +endif + if USE_LAME LAME_DIR=lame else @@ -90,9 +102,9 @@ endif SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DVDREAD_DIR) $(ESD_DIR) \ - $(FESTIVAL_DIR) $(FLAC_DIR) \ + $(FESTIVAL_DIR) $(FLAC_DIR) $(GSM_DIR) $(HERMES_DIR) \ $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \ $(SDL_DIR) $(VORBIS_DIR) DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dvdread esd \ - festival flac lame mad mpeg2dec sdl vorbis + festival flac gsm hermes lame mad mpeg2dec sdl vorbis |