11e4a69dc4
Diff from Martin Pieuchot based on a diff for 0.16.1 from Tobias Ulmer (maintainer). Note that configuration file may need an update (mixer_type is not global anymore, it's per-output), and mpd will recreate its database upon startup. Tested by jasper@ and myself, looks good to maintainer
43 lines
1.5 KiB
Plaintext
43 lines
1.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.13 2011/04/05 19:55:38 landry Exp $
|
|
|
|
Don't reset CPPFLAGS...stupid configure.
|
|
|
|
--- configure Mon Apr 4 22:34:06 2011
|
|
+++ configure Mon Apr 4 22:35:15 2011
|
|
@@ -8759,7 +8759,7 @@
|
|
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 :
|
|
|
|
@@ -9013,7 +9013,7 @@
|
|
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; }
|
|
@@ -9059,7 +9059,7 @@
|
|
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 :
|
|
@@ -10370,7 +10370,7 @@
|
|
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
|