Skip to content

W
wine-winehq
Commit 1089260f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Only link against libpoll where really necessary.

parent 6f872e53
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 94 deletions
configure
View file @ 1089260f
......@@ -756,6 +756,7 @@ SOCKETLIBS
MAIN_BINARY
EXTRA_BINARIES
LDD
LIBPOLL
LIBOBJS
LTLIBOBJS'
ac_subst_files='MAKE_RULES
......@@ -7777,93 +7778,6 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpoll $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* 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
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_poll_poll=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
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
{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
if test $ac_cv_lib_poll_poll = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPOLL 1
_ACEOF
LIBS="-lpoll $LIBS"
fi
{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
......@@ -19406,6 +19320,7 @@ fi
for ac_func in \
_lwp_create \
_lwp_self \
......@@ -19447,6 +19362,7 @@ for ac_func in \
memmove \
mmap \
pclose \
poll \
popen \
prctl \
pread \
......@@ -19583,6 +19499,94 @@ fi
done
if test "$ac_cv_func_poll" = no
then
{ echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpoll $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* 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
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_poll_poll=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
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
{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
if test $ac_cv_lib_poll_poll = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_POLL 1
_ACEOF
LIBPOLL="-lpoll"
fi
fi
{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
......@@ -25532,11 +25536,12 @@ SOCKETLIBS!$SOCKETLIBS$ac_delim
MAIN_BINARY!$MAIN_BINARY$ac_delim
EXTRA_BINARIES!$EXTRA_BINARIES$ac_delim
LDD!$LDD$ac_delim
LIBPOLL!$LIBPOLL$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
......
configure.ac
View file @ 1089260f
......@@ -144,8 +144,6 @@ dnl Check for -lresolv for Solaris
AC_CHECK_FUNCS(inet_aton,,AC_CHECK_LIB(resolv,inet_aton))
dnl Check for -lxpg4 for FreeBSD
AC_CHECK_LIB(xpg4,_xpg4_setrunelocale)
dnl Check for -lpoll for Mac OS X/Darwin
AC_CHECK_LIB(poll,poll)
dnl Check for -lpthread
AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread"))
......@@ -1304,6 +1302,7 @@ AC_CHECK_FUNCS(\
memmove \
mmap \
pclose \
poll \
popen \
prctl \
pread \
......@@ -1332,6 +1331,11 @@ AC_CHECK_FUNCS(\
waitpid \
)
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(LIBPOLL,"-lpoll")])
fi
dnl **** Check for types ****
......
dlls/kernel/Makefile.in
View file @ 1089260f
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = kernel32.dll
IMPORTLIB = libkernel32.$(IMPLIBEXT)
IMPORTS = ntdll
EXTRALIBS = @COREFOUNDATIONLIB@
EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
BASEADDRESS = 0x7b800000
SPEC_SRCS16 = \
......
dlls/ws2_32/Makefile.in
View file @ 1089260f
......@@ -7,6 +7,7 @@ MODULE = ws2_32.dll
IMPORTLIB = libws2_32.$(IMPLIBEXT)
IMPORTS = iphlpapi kernel32 ntdll
DELAYIMPORTS = user32
EXTRALIBS = @LIBPOLL@
C_SRCS = \
async.c \
......
include/config.h.in
View file @ 1089260f
......@@ -320,9 +320,6 @@
/* Define to 1 if you have the `ossaudio' library (-lossaudio). */
#undef HAVE_LIBOSSAUDIO
/* Define to 1 if you have the `poll' library (-lpoll). */
#undef HAVE_LIBPOLL
/* Define to 1 if you have the `resolv' library (-lresolv). */
#undef HAVE_LIBRESOLV
......@@ -503,6 +500,9 @@
/* Define to 1 if the system has the type `pid_t'. */
#undef HAVE_PID_T
/* 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
......
programs/winedbg/Makefile.in
View file @ 1089260f
......@@ -6,6 +6,7 @@ MODULE = winedbg.exe
APPMODE = -mconsole
IMPORTS = psapi dbghelp advapi32 kernel32 ntdll
DELAYIMPORTS = user32
EXTRALIBS = @LIBPOLL@
C_SRCS = \
be_alpha.c \
......
server/Makefile.in
View file @ 1089260f
......@@ -4,6 +4,7 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
EXTRALIBS = @LIBPOLL@
C_SRCS = \
atom.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment