frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sendmsg: remove --enable-sendfds as it is superceeded by --enable-dri3 

DRI3 requires sendmsg support which is auto-detected. A builder can enable
or disable dri3 feature. If sendmsg function is not available, dri3 cannot
be enabled.

This reverts af8067cbf4 which was done at a time where --enable-dri3
had not been added yet.

Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Gaetan Nadon 2014-03-26 15:24:46 -04:00 committed by Uli Schlachter
parent 23f57ac8bf
commit 74f552c1b3
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -90,14 +90,8 @@ AC_HEADER_STDC
AC_SEARCH_LIBS(getaddrinfo, socket) AC_SEARCH_LIBS(getaddrinfo, socket)
AC_SEARCH_LIBS(connect, socket) AC_SEARCH_LIBS(connect, socket)
AC_ARG_ENABLE(sendfds, AS_HELP_STRING([--disable-sendfds], [Support FD passing (default: auto)]), # Find support for sending a message from a socket
[sendfds=$enableval], [sendfds=auto]) AC_SEARCH_LIBS(sendmsg, socket, [have_sendmsg="yes"], [have_sendmsg="no"])
case x$sendfds in
xauto)
AC_SEARCH_LIBS(sendmsg, socket, [sendfds="yes"], [sendfds="no"])
;;
esac
# XPG4v2/UNIX95 added msg_control - check to see if we need to define # XPG4v2/UNIX95 added msg_control - check to see if we need to define
# _XOPEN_SOURCE to get it (such as on Solaris) # _XOPEN_SOURCE to get it (such as on Solaris)
@ -126,14 +120,14 @@ if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then
AC_CHECK_MEMBER([struct msghdr.msg_control], AC_CHECK_MEMBER([struct msghdr.msg_control],
[AC_DEFINE([_XOPEN_SOURCE], [500], [AC_DEFINE([_XOPEN_SOURCE], [500],
[Defined if needed to expose struct msghdr.msg_control]) [Defined if needed to expose struct msghdr.msg_control])
], [sendfds="no"], [ ], [have_sendmsg="no"], [
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
AC_INCLUDES_DEFAULT AC_INCLUDES_DEFAULT
#include <sys/socket.h> #include <sys/socket.h>
]) ])
fi fi
case x$sendfds in case x$have_sendmsg in
xyes) xyes)
AC_DEFINE([HAVE_SENDMSG],1,[Define if your platform supports sendmsg]) AC_DEFINE([HAVE_SENDMSG],1,[Define if your platform supports sendmsg])
;; ;;
@ -216,7 +210,7 @@ XCB_EXTENSION(Composite, yes)
XCB_EXTENSION(Damage, yes) XCB_EXTENSION(Damage, yes)
XCB_EXTENSION(DPMS, yes) XCB_EXTENSION(DPMS, yes)
XCB_EXTENSION(DRI2, yes) XCB_EXTENSION(DRI2, yes)
XCB_EXTENSION(DRI3, $sendfds) XCB_EXTENSION(DRI3, $have_sendmsg)
XCB_EXTENSION(GLX, yes) XCB_EXTENSION(GLX, yes)
XCB_EXTENSION(Present, yes) XCB_EXTENSION(Present, yes)
XCB_EXTENSION(RandR, yes) XCB_EXTENSION(RandR, yes)
@ -300,7 +294,7 @@ echo " Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"
echo "" echo ""
echo " Configuration" echo " Configuration"
echo " XDM support.........: ${have_xdmcp}" echo " XDM support.........: ${have_xdmcp}"
echo " sendmsg fd passing..: ${sendfds}" echo " sendmsg fd passing..: ${have_sendmsg}"
echo " Build unit tests....: ${HAVE_CHECK}" echo " Build unit tests....: ${HAVE_CHECK}"
echo " with html results.: ${HTML_CHECK_RESULT}" echo " with html results.: ${HTML_CHECK_RESULT}"
echo " XCB buffer size.....: ${xcb_queue_buffer_size}" echo " XCB buffer size.....: ${xcb_queue_buffer_size}"