diff options
Diffstat (limited to 'audio/pulseaudio/patches/patch-configure')
| -rw-r--r-- | audio/pulseaudio/patches/patch-configure | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/audio/pulseaudio/patches/patch-configure b/audio/pulseaudio/patches/patch-configure index cce71de8de2..9530f676d15 100644 --- a/audio/pulseaudio/patches/patch-configure +++ b/audio/pulseaudio/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.3 2013/05/06 20:44:18 markd Exp $ +$NetBSD: patch-configure,v 1.4 2013/11/30 12:34:52 wiz Exp $ - always use atomic_ops(3) on NetBSD, even on arm - kill test(1) bash'ism @@ -47,3 +47,53 @@ $NetBSD: patch-configure,v 1.3 2013/05/06 20:44:18 markd Exp $ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h +@@ -23063,12 +23063,12 @@ if test -n "$LIBJSON_CFLAGS"; then + pkg_cv_LIBJSON_CFLAGS="$LIBJSON_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json-c >= 0.9 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " json-c >= 0.9 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json >= 0.9 " 2>/dev/null` ++ pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json-c >= 0.9 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -23080,12 +23080,12 @@ if test -n "$LIBJSON_LIBS"; then + pkg_cv_LIBJSON_LIBS="$LIBJSON_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json-c >= 0.9 \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " json-c >= 0.9 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json >= 0.9 " 2>/dev/null` ++ pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json-c >= 0.9 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -23106,14 +23106,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json >= 0.9 " 2>&1` ++ LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json-c >= 0.9 " 2>&1` + else +- LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json >= 0.9 " 2>&1` ++ LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json-c >= 0.9 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBJSON_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements ( json >= 0.9 ) were not met: ++ as_fn_error $? "Package requirements ( json-c >= 0.9 ) were not met: + + $LIBJSON_PKG_ERRORS + |