[PATCH v2] Fix Xdmx build on Linux to work with strlcpy changes

[Alan Coopersmith]

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>
---

On 11/22/11 23:44, Keith Packard wrote:
> Any reason this file can't just include os.h?

None that I can see, I just hadn't thought about it.   I see nothing in
os.h that should break the scanner, and a build with os.h on Solaris has
no problems, so I've amended this patch to do that.

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

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 5ce268d..e527d6d 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>
-- 
1.7.3.2