From 55e09533db40f10ba3843d5b1736f9786f2fb5b8 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@codeweavers.com>
Date: Tue, 30 Jul 2019 18:39:28 +0200
Subject: [PATCH] xaudio2: Fix the optional FAudio functions check.

WINE_CHECK_LIB_FUNCS() must be called in WINE_PACKAGE_FLAGS()'s checks
parameter so this happens before CAUDIO_{FLAGS,LIBS} have been mangled
for use by makefiles.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 configure    | 16 ++++++++--------
 configure.ac |  9 ++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 177c83432c4..ed561670a35 100755
--- a/configure
+++ b/configure
@@ -15004,15 +15004,10 @@ fi
 
 done
 
-CPPFLAGS=$ac_save_CPPFLAGS
-test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I\([^/]\)/ -I\$(top_builddir)\/\1/g'`
-test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
-
-    ac_wine_check_funcs_save_LIBS="$LIBS"
+             ac_wine_check_funcs_save_LIBS="$LIBS"
 LIBS="$LIBS $FAUDIO_LIBS"
-for ac_func in \
-        FAudio_CommitOperationSet \
-        F3DAudioInitialize8
+for ac_func in FAudio_CommitOperationSet \
+                                   F3DAudioInitialize8
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15025,6 +15020,11 @@ fi
 done
 
 LIBS="$ac_wine_check_funcs_save_LIBS"
+
+CPPFLAGS=$ac_save_CPPFLAGS
+test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I\([^/]\)/ -I\$(top_builddir)\/\1/g'`
+test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
+
 fi
 if test "x$ac_cv_lib_soname_FAudio" = "x"; then :
   case "x$with_faudio" in
diff --git a/configure.ac b/configure.ac
index a2cd2c7cb23..0fe26022b7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1691,11 +1691,10 @@ if test "x$with_faudio" != "xno"
 then
     WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,,
         [AC_CHECK_HEADERS([FAudio.h],
-            [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])])
-    WINE_CHECK_LIB_FUNCS(\
-        FAudio_CommitOperationSet \
-        F3DAudioInitialize8,
-        [$FAUDIO_LIBS])
+            [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])
+             WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \
+                                   F3DAudioInitialize8], [$FAUDIO_LIBS])
+            ])
 fi
 WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"],
                  [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.])