Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
11b8bbc7
Commit
11b8bbc7
authored
Sep 05, 2019
by
Evgeny Litvinenko
Committed by
Alexandre Julliard
Sep 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
ec716e9e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
7 deletions
+21
-7
aclocal.m4
aclocal.m4
+7
-3
configure
configure
+14
-4
No files found.
aclocal.m4
View file @
11b8bbc7
...
@@ -178,10 +178,14 @@ dnl
...
@@ -178,10 +178,14 @@ dnl
dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]])
dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]])
dnl
dnl
AC_DEFUN([WINE_TRY_SHLIB_FLAGS],
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"
CFLAGS="$CFLAGS $1"
AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3])
AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])],
CFLAGS=$ac_wine_try_cflags_saved])
[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 **** Check whether we need to define a symbol on the compiler command line ****
dnl
dnl
...
...
configure
View file @
11b8bbc7
...
@@ -9318,13 +9318,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
...
@@ -9318,13 +9318,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
void myfunc() {}
void myfunc() {}
_ACEOF
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_c
_dll_gnuelf
=
"yes"
ac_cv_c
flags__fPIC__shared__Wl__Bsymbolic
=
yes
else
else
ac_cv_c
_dll_gnuelf
=
"no"
ac_cv_c
flags__fPIC__shared__Wl__Bsymbolic
=
no
fi
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
conftest
$ac_exeext
conftest.
$ac_ext
CFLAGS
=
$ac_wine_try_cflags_saved
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
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_c_dll_gnuelf
"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_c_dll_gnuelf
"
>
&5
$as_echo
"
$ac_cv_c_dll_gnuelf
"
>
&6
;
}
$as_echo
"
$ac_cv_c_dll_gnuelf
"
>
&6
;
}
...
@@ -9667,13 +9672,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
...
@@ -9667,13 +9672,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
void myfunc() {}
void myfunc() {}
_ACEOF
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_c
_dll_unixware
=
"yes"
ac_cv_c
flags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic
=
yes
else
else
ac_cv_c
_dll_unixware
=
"no"
ac_cv_c
flags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic
=
no
fi
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
conftest
$ac_exeext
conftest.
$ac_ext
CFLAGS
=
$ac_wine_try_cflags_saved
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
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_c_dll_unixware
"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_c_dll_unixware
"
>
&5
$as_echo
"
$ac_cv_c_dll_unixware
"
>
&6
;
}
$as_echo
"
$ac_cv_c_dll_unixware
"
>
&6
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment