From 133edff1b499b2c794fcc9a1860c1b5526b58869 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Tue, 13 Sep 2005 05:44:47 +0000
Subject: [PATCH] Don't define POSIX_SOURCE on any BSDs, since it breaks
 things. Define NO_SYS_HEADERS, as the monolithic build does. Helps FreeBSD.
 Don't include validate.c in the library, since it seems to be a userland    
 test program.

---
 ChangeLog                     | 12 ++++++++++++
 configure.ac                  |  2 +-
 hw/xfree86/int10/Makefile.am  |  2 +-
 hw/xfree86/x86emu/Makefile.am |  1 -
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f22b257c..9df5e252d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-12  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	Don't define POSIX_SOURCE on any BSDs, since it breaks things.
+
+	* hw/xfree86/int10/Makefile.am:
+	Define NO_SYS_HEADERS, as the monolithic build does.  Helps FreeBSD.
+
+	* hw/xfree86/x86emu/Makefile.am:
+	Don't include validate.c in the library, since it seems to be a userland
+	test program.
+
 2005-09-12  Daniel Stone  <daniel@freedesktop.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 0f84c7980..6c6a02bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,7 +856,7 @@ case $host_os in
 	cygwin*) ;;
 	solaris*) ;;
         darwin*) ;;
-	openbsd*) ;;
+	*bsd*) ;;
 	*) 
 		AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source])
 		AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source])
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
index 36b780ad7..03debaf02 100644
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@@ -18,7 +18,7 @@ libint10_la_SOURCES = \
 endif
 
 if INT10_X86EMU
-AM_CFLAGS = -D_X86EMU -D_PC $(XORG_CFLAGS)
+AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS)
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
 libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
 	xf86int10.c xf86x86emu.c generic.c x86emu.c
diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index 5c1aec6ab..8753104dc 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -7,7 +7,6 @@ libx86emu_a_SOURCES = debug.c \
                       ops.c \
                       prim_ops.c \
                       sys.c \
-                      validate.c \
                       x86emu.h
 
 INCLUDES =