xserver: Branch 'master'

[Keith Packard]

 hw/dmx/config/Makefile.am |    4 ++++
 hw/dmx/config/scanner.l   |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 7b0f53f0a5824fcd81ef505beb3e19ac7c77961f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Nov 23 10:50:13 2011 -0800

    Fix Xdmx build on Linux to work with strlcpy changes
    
    Include strlcpy.c in the  libdmxconfig.a library with the other functions
    shared among the xdmx configuration programs.
    
    Also add a #include "os.h" to the scanner.l file that now calls strlcpy
    to include the prototype from $(top_srcdir)/include/os.h.
    
    (To be squashed into
    http://cgit.freedesktop.org/~alanc/xserver/commit/?id=c19f0ff5223d428f8ad2ab3c563c974c96a521ba
    before next PULL request to avoid breaking bisection.)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index de4ce31..7518143 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -22,6 +22,10 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
 libdmxconfig_a_SOURCES = $(LIBSRCS)
 
+if NEED_STRLCAT
+libdmxconfig_a_SOURCES += $(top_srcdir)/os/strlcpy.c
+endif
+
 if GLX
 GLX_DEFS = @GL_CFLAGS@
 endif	    
diff --git a/hw/dmx/config/scanner.l b/hw/dmx/config/scanner.l
index cef99d0..f5bb73b 100644
--- a/hw/dmx/config/scanner.l
+++ b/hw/dmx/config/scanner.l
@@ -39,6 +39,7 @@
 
 #include "dmxparse.h"
 #include "parser.h"
+#include "os.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>