From c9c44e81a3c4e528ca43529b802066e28f1fa52b Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Thu, 28 Nov 2013 17:06:59 +1300
Subject: [PATCH] Bug 943159 - Remove MOZ_SPEEX_RESAMPLER/MOZ_SOUNDTOUCH
 defines since we don't support building without them anyway.  r=doublec,gps

---
 config/external/moz.build   | 12 +++++-------
 configure.in                | 12 ------------
 layout/media/symbols.def.in |  2 --
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/config/external/moz.build b/config/external/moz.build
index 64a508c1cf0..6e803a4759f 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -33,18 +33,16 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
 if CONFIG['MOZ_OGG']:
     external_dirs += ['media/libogg', 'media/libtheora']
 
-if CONFIG['MOZ_SPEEX_RESAMPLER']:
-    external_dirs += ['media/libspeex_resampler']
-
-if CONFIG['MOZ_SOUNDTOUCH']:
-    external_dirs += ['media/libsoundtouch']
-
 if CONFIG['MOZ_CUBEB']:
     external_dirs += ['media/libcubeb']
 
 if not CONFIG['MOZ_NATIVE_PNG']:
     external_dirs += ['media/libpng']
 
-external_dirs += ['media/kiss_fft']
+external_dirs += [
+    'media/kiss_fft',
+    'media/libspeex_resampler',
+    'media/libsoundtouch',
+]
 
 PARALLEL_DIRS += ['../../' + i for i in external_dirs]
diff --git a/configure.in b/configure.in
index 23b1f42a629..22db974609c 100644
--- a/configure.in
+++ b/configure.in
@@ -3938,8 +3938,6 @@ MOZ_JSDEBUGGER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_OGG=1
 MOZ_RAW=
-MOZ_SPEEX_RESAMPLER=1
-MOZ_SOUNDTOUCH=1
 MOZ_CUBEB=
 MOZ_VORBIS=
 MOZ_TREMOR=
@@ -5521,14 +5519,6 @@ dnl ========================================================
 dnl = Handle dependent CUBEB and MEDIA defines
 dnl ========================================================
 
-if test -n "$MOZ_SPEEX_RESAMPLER"; then
-    AC_DEFINE(MOZ_SPEEX_RESAMPLER)
-fi
-
-if test -n "$MOZ_SOUNDTOUCH"; then
-    AC_DEFINE(MOZ_SOUNDTOUCH)
-fi
-
 if test -n "$MOZ_CUBEB"; then
     AC_DEFINE(MOZ_CUBEB)
 fi
@@ -8665,8 +8655,6 @@ AC_SUBST(MOZ_NSS_PATCH)
 AC_SUBST(MOZ_APP_COMPONENT_LIBS)
 AC_SUBST(MOZ_APP_EXTRA_LIBS)
 
-AC_SUBST(MOZ_SPEEX_RESAMPLER)
-AC_SUBST(MOZ_SOUNDTOUCH)
 AC_SUBST(MOZ_CUBEB)
 AC_SUBST(MOZ_WAVE)
 AC_SUBST(MOZ_VORBIS)
diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in
index a72b003f995..1f4bbcc29da 100644
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -95,7 +95,6 @@ vorbis_synthesis_pcmout
 vorbis_synthesis_read
 vorbis_synthesis_restart
 #endif
-#ifdef MOZ_SPEEX_RESAMPLER
 speex_resampler_init
 speex_resampler_init_frac
 speex_resampler_destroy
@@ -118,7 +117,6 @@ speex_resampler_get_output_latency
 speex_resampler_skip_zeros
 speex_resampler_reset_mem
 speex_resampler_strerror
-#endif
 #ifdef MOZ_CUBEB
 cubeb_destroy
 cubeb_init