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
5a197692
Commit
5a197692
authored
Oct 04, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Remove no longer needed poll() checks.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0ea9fe99
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
61 deletions
+1
-61
configure
configure
+0
-49
configure.ac
configure.ac
+0
-7
Makefile.in
dlls/ws2_32/Makefile.in
+0
-1
config.h.in
include/config.h.in
+0
-3
Makefile.in
server/Makefile.in
+1
-1
No files found.
configure
View file @
5a197692
...
...
@@ -628,7 +628,6 @@ ALL_VARS_RULES
LDAP_LIBS
LDAP_CFLAGS
RT_LIBS
POLL_LIBS
TOOLSEXT
MSVCRTFLAGS
EXTRACFLAGS
...
...
@@ -17914,7 +17913,6 @@ for ac_func in \
lstat
\
mach_continuous_time
\
pipe2
\
poll
\
port_create
\
posix_fadvise
\
posix_fallocate
\
...
...
@@ -18015,52 +18013,6 @@ done
LIBS
=
"
$ac_wine_check_funcs_save_LIBS
"
if
test
"
$ac_cv_func_poll
"
=
no
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for poll in -lpoll"
>
&5
$as_echo_n
"checking for poll in -lpoll... "
>
&6
;
}
if
${
ac_cv_lib_poll_poll
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
ac_check_lib_save_LIBS
=
$LIBS
LIBS
=
"-lpoll
$LIBS
"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char poll ();
int
main ()
{
return poll ();
;
return 0;
}
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_lib_poll_poll
=
yes
else
ac_cv_lib_poll_poll
=
no
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
$ac_check_lib_save_LIBS
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_lib_poll_poll
"
>
&5
$as_echo
"
$ac_cv_lib_poll_poll
"
>
&6
;
}
if
test
"x
$ac_cv_lib_poll_poll
"
=
xyes
;
then
:
$as_echo
"#define HAVE_POLL 1"
>>
confdefs.h
POLL_LIBS
=
"-lpoll"
fi
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for library containing gethostbyname"
>
&5
$as_echo_n
"checking for library containing gethostbyname... "
>
&6
;
}
if
${
ac_cv_search_gethostbyname
+
:
}
false
;
then
:
...
...
@@ -19859,7 +19811,6 @@ VKD3D_CFLAGS = $VKD3D_CFLAGS
VKD3D_LIBS =
$VKD3D_LIBS
VKD3D_SHADER_CFLAGS =
$VKD3D_SHADER_CFLAGS
VKD3D_SHADER_LIBS =
$VKD3D_SHADER_LIBS
POLL_LIBS =
$POLL_LIBS
RT_LIBS =
$RT_LIBS
LDAP_CFLAGS =
$LDAP_CFLAGS
LDAP_LIBS =
$LDAP_LIBS
...
...
configure.ac
View file @
5a197692
...
...
@@ -2144,7 +2144,6 @@ AC_CHECK_FUNCS(\
lstat \
mach_continuous_time \
pipe2 \
poll \
port_create \
posix_fadvise \
posix_fallocate \
...
...
@@ -2166,12 +2165,6 @@ dnl Check for -ldl
AC_SEARCH_LIBS(dlopen, dl)
WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS])
dnl Check for -lpoll for Mac OS X/Darwin
if test "$ac_cv_func_poll" = no
then
AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(POLL_LIBS,"-lpoll")])
fi
dnl Check for -lnsl for Solaris
AC_SEARCH_LIBS(gethostbyname, nsl)
...
...
dlls/ws2_32/Makefile.in
View file @
5a197692
...
...
@@ -2,7 +2,6 @@ MODULE = ws2_32.dll
UNIXLIB
=
ws2_32.so
IMPORTLIB
=
ws2_32
DELAYIMPORTS
=
advapi32 iphlpapi user32
EXTRALIBS
=
$(POLL_LIBS)
C_SRCS
=
\
async.c
\
...
...
include/config.h.in
View file @
5a197692
...
...
@@ -480,9 +480,6 @@
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
/* Define to 1 if you have the `poll' function. */
#undef HAVE_POLL
/* Define to 1 if you have the <poll.h> header file. */
#undef HAVE_POLL_H
...
...
server/Makefile.in
View file @
5a197692
...
...
@@ -49,6 +49,6 @@ MANPAGES = \
wineserver.fr.UTF-8.man.in
\
wineserver.man.in
EXTRALIBS
=
$(LDEXECFLAGS)
$(
POLL_LIBS)
$(
RT_LIBS)
$(INOTIFY_LIBS)
EXTRALIBS
=
$(LDEXECFLAGS)
$(RT_LIBS)
$(INOTIFY_LIBS)
unicode_EXTRADEFS
=
-DNLSDIR
=
"
\"
${
nlsdir
}
\"
"
-DBIN_TO_NLSDIR
=
\"
`
$(MAKEDEP)
-R
${
bindir
}
${
nlsdir
}
`
\"
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