xserver: Branch 'master' - 4 commits

[Peter Hutterer]

 configure.ac     |    2 +-
 dix/events.c     |    2 +-
 hw/dmx/dmx.c     |    4 +---
 shave-libtool.in |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit d3c66d6b69c04466b8388586090dc48a0aad7684
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Sep 14 08:03:17 2009 +1000

    dix: FindChildForEvent needs init child to None.
    
    silences compiler warning:
    events.c: In function 'FixUpEventFromWindow':
    events.c:2262: warning: 'child' may be used uninitialized in this function
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/events.c b/dix/events.c
index 90a2675..0d01df5 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2259,7 +2259,7 @@ static Window FindChildForEvent(DeviceIntPtr dev, WindowPtr event)
 {
     SpritePtr pSprite = dev->spriteInfo->sprite;
     WindowPtr w = pSprite->spriteTrace[pSprite->spriteTraceGood-1];
-    Window child;
+    Window child = None;
 
     /* If the search ends up past the root should the child field be
        set to none or should the value in the argument be passed
commit e85775aa64d1e9322c82090a26256af5e1fede0a
Author: Kevin E Martin <kem at redhat.com>
Date:   Mon Sep 14 08:01:56 2009 +1000

    Include <X11/extensions/dmx.h> and remove _DMX_SERVER_ define.
    
    Fixes build with newer dmx header files that have been split between dmx.h
    and dmxext.h.  _DMX_SERVER_ is no longer needed with the split headers.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 87d408d..82f95c9 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -56,9 +56,7 @@
 
 #include "dmxextension.h"
 #include <X11/extensions/dmxproto.h>
-
-#define _DMX_SERVER_
-#include <X11/extensions/dmxext.h>
+#include <X11/extensions/dmx.h>
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
commit 232d43510e0f9f780a9f8eb857366e03acf2fcdc
Author: Kevin E Martin <kem at redhat.com>
Date:   Mon Sep 14 08:00:42 2009 +1000

    dmx: Make description match default option.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 7bc05b6..5283562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -594,7 +594,7 @@ AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build X
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=auto])
+AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
 AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
 AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: yes)]), [XNEST=$enableval], [XNEST=yes])
 AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
commit 6389a190faa7c06bdedfd1cc3acb280ebb5cc04a
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Sat Sep 12 21:47:51 2009 +0300

    shave: use CC tag variable on libtool
    
    This fix scratchbox compilation.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/shave-libtool.in b/shave-libtool.in
index 1f3a720..f19a69e 100644
--- a/shave-libtool.in
+++ b/shave-libtool.in
@@ -12,7 +12,7 @@ lt_unmangle ()
 }
 
 # the real libtool to use
-LIBTOOL="$1"
+LIBTOOL="$1 --tag=CC"
 shift
 
 # if 1, don't print anything, the underlaying wrapper will do it