1 files changed, 14 insertions, 45 deletions
diff --git a/audio/alsa-plugins/files/patch-configure b/audio/alsa-plugins/files/patch-configure
index 3580160d1b36..a0da753a0c6d 100644
--- a/audio/alsa-plugins/files/patch-configure
+++ b/audio/alsa-plugins/files/patch-configure
@@ -1,31 +1,10 @@
 --- configure.orig	2010-04-16 13:18:56.000000000 +0200
 +++ configure	2010-05-11 00:08:29.000000000 +0200
-@@ -21249,6 +21249,20 @@
- 
- 
- 
-+
-+
-+
-+# Check whether --with-speex was given.
-+if test "${with_speex+set}" = set; then
-+  withval=$with_speex; PPH=$withval
-+else
-+  PPH="lib"
-+fi
-+
-+
-+USE_LIBSPEEX=""
-+HAVE_SPEEXDSP=""
-+if test "$PPH" = "lib"; then
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for speexdsp" >&5
- echo $ECHO_N "checking for speexdsp... $ECHO_C" >&6; }
-@@ -21319,26 +21333,6 @@
+@@ -19608,14 +19608,6 @@ else
+ $as_echo "yes" >&6; }
+ 	HAVE_SPEEXDSP="yes"
  fi
- 
- 
--if test "$HAVE_SPEEXDSP" = "yes"; then
+- if test "$HAVE_SPEEXDSP" = "yes"; then
 -  HAVE_SPEEXDSP_TRUE=
 -  HAVE_SPEEXDSP_FALSE='#'
 -else
@@ -33,32 +12,22 @@
 -  HAVE_SPEEXDSP_FALSE=
 -fi
 -
--
--
--# Check whether --with-speex was given.
--if test "${with_speex+set}" = set; then
--  withval=$with_speex; PPH=$withval
--else
--  PPH="lib"
--fi
--
--
--USE_LIBSPEEX=""
--if test "$PPH" = "lib"; then
- 	if test "$HAVE_SPEEXDSP" = "yes"; then
- 		{ echo "$as_me:$LINENO: checking for speex_resampler_init in -lspeexdsp" >&5
- echo $ECHO_N "checking for speex_resampler_init in -lspeexdsp... $ECHO_C" >&6; }
-@@ -21437,6 +21431,13 @@
+ 
+ 
+ # Check whether --with-speex was given.
+@@ -19626,6 +19618,15 @@ else
  fi
  
  
-+if test "$HAVE_SPEEXDSP" = "yes"; then
++ if test "$HAVE_SPEEXDSP" = "yes" -a "$PPH" != "no"; then
 +  HAVE_SPEEXDSP_TRUE=
 +  HAVE_SPEEXDSP_FALSE='#'
 +else
 +  HAVE_SPEEXDSP_TRUE='#'
 +  HAVE_SPEEXDSP_FALSE=
 +fi
- 
- if test "$PPH" = "builtin" -o "$PPH" = "lib"; then
-   HAVE_PPH_TRUE=
++
++
+ USE_LIBSPEEX=""
+ if test "$PPH" = "lib"; then
+ 	if test "$HAVE_SPEEXDSP" = "yes"; then