[PULL] Configure fixes for Windows MinGW target
Jon TURNEY
jon.turney at dronecode.org.uk
Wed May 2 05:37:06 PDT 2012
On 02/05/2012 02:50, Keith Packard wrote:
> On Tue, 01 May 2012 20:23:38 +0100, Jon TURNEY <jon.turney at dronecode.org.uk> wrote:
>
>> Ryan Pavlik (3):
>> configure.ac: auto-disable MITSHM if we lack IPC
>
> This patch is broken, HAVE_SYSV_IPC is a config.h entry, not a
> configure.ac variable. This seems to fix it for me:
>
> diff --git a/configure.ac b/configure.ac
> index d6771ef..6a41ea8 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1003,7 +1003,7 @@ if test "x$COMPOSITE" = xyes; then
> fi
>
> if test "x$MITSHM" = xauto; then
> - MITSHM="$HAVE_SYSV_IPC"
> + MITSHM="$ac_cv_sysv_ipc"
> fi
> AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
> if test "x$MITSHM" = xyes; then
>
Thanks very much for spotting that.
I have amended that patch as suggested and re-pushed my branch.
The following changes since commit f3410b97cf9b48a47bee3d15d232f8a88e75f4ef:
dix: when disabling a device, release all buttons and keys (2012-05-01
11:36:36 +1000)
are available in the git repository at:
git://people.freedesktop.org/~jturney/xserver master
for you to fetch changes up to 19082726cb2c69f53e9720904521e3c98f788bff:
configure.ac: on MinGW, link with ws2_32 instead of winsock2 (2012-05-02
12:40:33 +0100)
----------------------------------------------------------------
Jon TURNEY (1):
configure.ac: Make default configuration for MinGW disable unsupported
extensions and DDXs
Ryan Pavlik (3):
configure.ac: auto-disable MITSHM if we lack IPC
configure.ac: MinGW doesn't have setuid binaries either.
configure.ac: on MinGW, link with ws2_32 instead of winsock2
configure.ac | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
More information about the xorg-devel
mailing list