$OpenBSD: patch-configure,v 1.11 2010/05/22 11:10:09 jasper Exp $

Don't reset CPPFLAGS...stupid configure.

--- configure.orig	Mon Mar 22 01:24:53 2010
+++ configure	Fri May 21 16:51:51 2010
@@ -8979,7 +8979,7 @@ if test x$enable_mpc = xyes; then
 	oldcppflags=$CPPFLAGS
 	CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I."
 	LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS"
-	CPPFLAGS=$CFLAGS
+	CPPFLAGS="$CPPFLAGS $CFLAGS"
 	ac_fn_c_check_header_mongrel "$LINENO" "mpc/mpcdec.h" "ac_cv_header_mpc_mpcdec_h" "$ac_includes_default"
 if test "x$ac_cv_header_mpc_mpcdec_h" = x""yes; then :
   old_mpcdec=no
@@ -9203,7 +9203,7 @@ if test x$enable_aac = xyes; then
 	oldcppflags=$CPPFLAGS
 	CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
 	LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
-	CPPFLAGS=$CFLAGS
+	CPPFLAGS="$CPPFLAGS $CFLAGS"
 	ac_fn_c_check_header_mongrel "$LINENO" "faad.h" "ac_cv_header_faad_h" "$ac_includes_default"
 if test "x$ac_cv_header_faad_h" = x""yes; then :
 
@@ -9457,7 +9457,7 @@ if test x$enable_aac = xyes; then
 	oldcppflags=$CPPFLAGS
 	CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror"
 	LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
-	CPPFLAGS=$CFLAGS
+	CPPFLAGS="$CPPFLAGS $CFLAGS"
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libfaad headers" >&5
 $as_echo_n "checking for broken libfaad headers... " >&6; }
@@ -9503,7 +9503,7 @@ if test x$enable_aac = xyes; then
 	oldcppflags=$CPPFLAGS
 	CFLAGS="$CFLAGS $FAAD_CFLAGS"
 	LIBS="$LIBS $FAAD_LIBS $MP4FF_LIBS"
-	CPPFLAGS=$CFLAGS
+	CPPFLAGS="$CPPFLAGS $CFLAGS"
 
 	ac_fn_c_check_header_mongrel "$LINENO" "mp4ff.h" "ac_cv_header_mp4ff_h" "$ac_includes_default"
 if test "x$ac_cv_header_mp4ff_h" = x""yes; then :
