From: Brendan Shanks <bshanks(a)codeweavers.com> --- aclocal.m4 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0597c37ece2..6f5994bce17 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -113,10 +113,12 @@ if test -s conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD fi rm -f conftest.err -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $ac_cflags" -$6 -CPPFLAGS=$ac_save_CPPFLAGS +AS_IF( + [test "x$ac_cflags" != "x" -o "x$ac_libs" != "x"], + [ac_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $ac_cflags" + $6 + CPPFLAGS=$ac_save_CPPFLAGS]) AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl @@ -135,10 +137,12 @@ AS_VAR_IF([ac_libs],[], [AS_VAR_SET_IF([MINGW_PKG_CONFIG], [ac_libs=`$MINGW_PKG_CONFIG --libs [$2] 2>/dev/null`])]) m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $ac_cflags" -$4 -CPPFLAGS=$ac_save_CPPFLAGS +AS_IF( + [test "x$ac_cflags" != "x" -o "x$ac_libs" != "x"], + [ac_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $ac_cflags" + $4 + CPPFLAGS=$ac_save_CPPFLAGS]) AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9313