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@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

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	    

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>