added hermes

Original commit message from CVS:
added hermes

diff --git a/configure.ac b/configure.ac
index a5dc600..531b70b 100644 (file)
--- 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 83000f8..e981f57 100644 (file)
--- 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