$NetBSD: patch-ac,v 1.1.1.1 2009/02/26 18:00:34 hasso Exp $

--- configure.orig	2007-04-06 16:23:22 +0300
+++ configure	2009-02-20 20:04:46 +0200
@@ -913,6 +913,8 @@ VORBIS_LIBS
 VORBISFILE_LIBS
 include_xiph_decoder_TRUE
 include_xiph_decoder_FALSE
+include_mpc_decoder_FALSE
+include_mpc_decoder_TRUE
 include_src_resampler_TRUE
 include_src_resampler_FALSE
 include_alsa_sink_TRUE
@@ -1559,6 +1561,7 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-tags[=TAGS]      include additional configurations [automatic]
+  --with-mpc              Enable MPC support [default=yes]
   --with-flac             Enable FLAC support [default=check]
   --with-speex            Enable speex support [default=check]
   --with-libmad           Enable libmad support [default=check]
@@ -23630,6 +23633,12 @@ ac_config_headers="$ac_config_headers ak
 
 
 
+# Check whether --with-mpc was given.
+if test "${with_mpc+set}" = set; then
+  withval=$with_mpc; with_mpc="$withval"
+else
+  with_mpc="yes"
+fi
 
 # Check whether --with-flac was given.
 if test "${with_flac+set}" = set; then
@@ -23639,6 +23648,8 @@ else
 fi
 
 
+have_libFLAC=no
+have_libOggFLAC=no
 if test "x$flac_test" = "xyes" ; then
 
 
@@ -24539,6 +24550,7 @@ else
 fi
 
 
+have_libspeex=no
 if test "x$speex_test" = "xyes" ; then
 { echo "$as_me:$LINENO: checking for speex headers" >&5
 echo $ECHO_N "checking for speex headers... $ECHO_C" >&6; }
@@ -24554,8 +24566,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                #include <speex.h>
-                #include <speex_callbacks.h>
+                #include <speex/speex.h>
+                #include <speex/speex_callbacks.h>
                 #include <ogg/ogg.h>
 
 int
@@ -24733,10 +24745,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                #include <speex.h>
-                #include <speex_callbacks.h>
-                #include <speex_echo.h>
-                #include <speex_preprocess.h>
+                #include <speex/speex.h>
+                #include <speex/speex_callbacks.h>
+                #include <speex/speex_echo.h>
+                #include <speex/speex_preprocess.h>
                 #include <ogg/ogg.h>
 
 int
@@ -25506,12 +25518,12 @@ fi
 
 
 if test "x$polypaudio_test" = "xyes" ; then
-{ echo "$as_me:$LINENO: checking for Polypaudio 0.7 or later" >&5
-echo $ECHO_N "checking for Polypaudio 0.7 or later... $ECHO_C" >&6; }
-if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
-  POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
-  POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
-  POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
+{ echo "$as_me:$LINENO: checking for Pulseaudio 0.9.2 or later" >&5
+echo $ECHO_N "checking for Pulseaudio 0.9.2 or later... $ECHO_C" >&6; }
+if $PKG_CONFIG --atleast-version 0.7 libpulse-simple >/dev/null 2>&1 ; then
+  POLYP_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
+  POLYP_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
+  POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
   have_polyp=yes
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
@@ -28341,6 +28353,13 @@ if test x$have_libFLAC$have_libOggFLAC$h
 fi
 
 
+if test x$with_mpc = xyes; then
+  include_mpc_decoder_TRUE=
+  include_mpc_decoder_FALSE='#'
+else
+  include_mpc_decoder_TRUE='#'
+  include_mpc_decoder_FALSE=
+fi
 
 if test x$usefull_xiph_decoder = xyes; then
   include_xiph_decoder_TRUE=
@@ -28660,6 +28679,13 @@ echo "$as_me: error: conditional \"inclu
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${include_mpc_decoder_TRUE}" && test -z "${include_mpc_decoder_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"include_mpc_decoder\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"include_mpc_decoder\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${include_xiph_decoder_TRUE}" && test -z "${include_xiph_decoder_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"include_xiph_decoder\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30094,7 +30120,7 @@ if test "x$have_libOggFLAC" = "xno"; the
         echo ">"
 fi
 
-if test "x$have_libSPEEX" = "xno"; then
+if test "x$have_libspeex" = "xno"; then
         echo ">"
         echo "> You do not seem to have libspeex installed."
         echo "> Without it aKode and aRts will not be"