While investigating https://bugs.winehq.org/show_bug.cgi?id=53953, it may be a good idea to log any pkg-config error messages instead of ignoring them.
Signed-off-by: Eric Pouech eric.pouech@gmail.com
From: Eric Pouech eric.pouech@gmail.com
While investigating https://bugs.winehq.org/show_bug.cgi?id=53953, it may be a good idea to log any pkg-config error messages instead of ignoring them.
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- aclocal.m4 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4 index 080f782b698..5497e906b4a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -116,16 +116,23 @@ AS_VAR_PUSHDEF([ac_libs],[[$1]_LIBS])dnl AC_ARG_VAR(ac_cflags, [C compiler flags for $2, overriding pkg-config])dnl AS_VAR_IF([ac_cflags],[], [AS_VAR_SET_IF([PKG_CONFIG], - [ac_cflags=`$PKG_CONFIG --cflags [$2] 2>/dev/null`])]) + [ac_cflags=`$PKG_CONFIG --cflags [$2] 2>/dev/null` + test "x$?" != "x0" && [$1]_pkg_found_error=yes + ])]) m4_ifval([$4],[test "$cross_compiling" = yes || ac_cflags=[$]{ac_cflags:-[$4]}]) AC_ARG_VAR(ac_libs, [Linker flags for $2, overriding pkg-config])dnl AS_VAR_IF([ac_libs],[], [AS_VAR_SET_IF([PKG_CONFIG], - [ac_libs=`$PKG_CONFIG --libs [$2] 2>/dev/null`])]) + [ac_libs=`$PKG_CONFIG --libs [$2] 2>/dev/null` + test "x$?" != "x0" && [$1]_pkg_found_error=yes + ])]) m4_ifval([$5],[test "$cross_compiling" = yes || ac_libs=[$]{ac_libs:-[$5]}]) m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 cflags: $ac_cflags"]) >&AS_MESSAGE_LOG_FD AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 libs: $ac_libs"]) >&AS_MESSAGE_LOG_FD +[$1]_pkg_errors=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` +AS_VAR_IF([[$1]_pkg_found_error],[yes], + AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 errors: [$][$1]_pkg_errors"])) >&AS_MESSAGE_LOG_FD ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ac_cflags" $6
-
Eric Pouech -
eric pouech (＠epo)