From 11b8bbc7b93bce65986e0fd649b2c400aa7718fd Mon Sep 17 00:00:00 2001
From: Evgeny Litvinenko <evgeny.v.litvinenko@gmail.com>
Date: Thu, 5 Sep 2019 23:55:49 +0300
Subject: [PATCH] aclocal.m4: Allow nesting WINE_TRY_SHLIB_FLAGS.

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 aclocal.m4 | 10 +++++++---
 configure  | 18 ++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index ed0c3a8317c..194b3a9d935 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -178,10 +178,14 @@ dnl
 dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]])
 dnl
 AC_DEFUN([WINE_TRY_SHLIB_FLAGS],
-[ac_wine_try_cflags_saved=$CFLAGS
+[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl
+ac_wine_try_cflags_saved=$CFLAGS
 CFLAGS="$CFLAGS $1"
-AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3])
-CFLAGS=$ac_wine_try_cflags_saved])
+AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])],
+               [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
+CFLAGS=$ac_wine_try_cflags_saved
+AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl
+AS_VAR_POPDEF([ac_var])])
 
 dnl **** Check whether we need to define a symbol on the compiler command line ****
 dnl
diff --git a/configure b/configure
index 0c54e27f5fb..83d8591c1d9 100755
--- a/configure
+++ b/configure
@@ -9318,13 +9318,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 void myfunc() {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_c_dll_gnuelf="yes"
+  ac_cv_cflags__fPIC__shared__Wl__Bsymbolic=yes
 else
-  ac_cv_c_dll_gnuelf="no"
+  ac_cv_cflags__fPIC__shared__Wl__Bsymbolic=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 CFLAGS=$ac_wine_try_cflags_saved
+if test "x$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic" = xyes; then :
+  ac_cv_c_dll_gnuelf="yes"
+else
+  ac_cv_c_dll_gnuelf="no"
+fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_gnuelf" >&5
 $as_echo "$ac_cv_c_dll_gnuelf" >&6; }
@@ -9667,13 +9672,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 void myfunc() {}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_c_dll_unixware="yes"
+  ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic=yes
 else
-  ac_cv_c_dll_unixware="no"
+  ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 CFLAGS=$ac_wine_try_cflags_saved
+if test "x$ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic" = xyes; then :
+  ac_cv_c_dll_unixware="yes"
+else
+  ac_cv_c_dll_unixware="no"
+fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_unixware" >&5
 $as_echo "$ac_cv_c_dll_unixware" >&6; }