| --- daala-cc4432e/m4/pkg.m4.orig 2015-04-03 02:08:04.000000000 +0000 |
| +++ daala-cc4432e/m4/pkg.m4 2015-04-06 12:13:46.678780600 +0000 |
| @@ -122,9 +122,9 @@ |
| AC_MSG_RESULT([no]) |
| _PKG_SHORT_ERRORS_SUPPORTED |
| if test $_pkg_short_errors_supported = yes; then |
| - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
| + $1[]_PKG_ERRORS=`$PKG_CONFIG --dont-define-prefix --short-errors --print-errors --cflags --libs "$2" 2>&1` |
| else |
| - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
| + $1[]_PKG_ERRORS=`$PKG_CONFIG --dont-define-prefix --print-errors --cflags --libs "$2" 2>&1` |
| fi |
| # Put the nasty error message in config.log where it belongs |
| echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
| --- daala-cc4432e/m4/pkg.m4.orig 2015-04-06 12:17:39.485343300 +0000 |
| +++ daala-cc4432e/m4/pkg.m4 2015-04-06 12:19:32.115645500 +0000 |
| @@ -111,8 +111,8 @@ |
| pkg_failed=no |
| AC_MSG_CHECKING([for $1]) |
| |
| -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
| -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
| +_PKG_CONFIG([$1][_CFLAGS], [cflags --dont-define-prefix], [$2]) |
| +_PKG_CONFIG([$1][_LIBS], [libs --dont-define-prefix], [$2]) |
| |
| m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
| and $1[]_LIBS to avoid the need to call pkg-config. |
