Module: wine Branch: master Commit: 5a19769245c43c3f596322acffa818d920ac52f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a19769245c43c3f596322acf...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 4 15:26:24 2021 +0200
configure: Remove no longer needed poll() checks.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 49 ------------------------------------------------- configure.ac | 7 ------- dlls/ws2_32/Makefile.in | 1 - include/config.h.in | 3 --- server/Makefile.in | 2 +- 5 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/configure b/configure index 2a429f4c13d..7e149e0ac9b 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index 913692c828a..6e82e4fbb8d 100644 --- a/configure.ac +++ b/configure.ac @@ -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)
diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index bf9018260a4..232ce7f31fd 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -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 \ diff --git a/include/config.h.in b/include/config.h.in index 80cc9c3a47f..c239b283f58 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -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
diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b6197cffec3 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -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}`"