add x86emu.

configure.ac

@@ -567,7 +567,7 @@ fi
 AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order])
 XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
 test x$XORG = xyes && case $host_os in
-  linux-gnu*)
+  linux*)
   	XORG_OS="linux"
 	XORG_OS_SUBDIR="linux"
 	;;
@@ -750,6 +750,7 @@ hw/xfree86/scanpci/Makefile
 hw/xfree86/shadowfb/Makefile
 hw/xfree86/vbe/Makefile
 hw/xfree86/vgahw/Makefile
+hw/xfree86/x86emu/Makefile
 hw/xfree86/xaa/Makefile
 hw/xfree86/xf1bpp/Makefile
 hw/xfree86/xf4bpp/Makefile

hw/xfree86/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac \
+SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
 	  xf8_32wid loader scanpci dixmods
 

hw/xfree86/int10/Makefile.am

@@ -17,9 +17,10 @@ endif
 
 if INT10_X86EMU
 AM_CFLAGS = -D_X86EMU -D_PC $(XORG_CFLAGS)
-INCLUDES = $(XORG_INCS) -I/home/daniels/x/xorg/xc/extras/x86emu/include -I/home/daniels/x/xorg/xc/extras/x86emu/src/x86emu
+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
+libint10_la_LIBADD = $(srcdir)/../x86emu/libx86emu.a
 endif
 
 if INT10_STUB

hw/xfree86/x86emu/Makefile.am

@@ -0,0 +1,8 @@
+noinst_LIBRARIES = libx86emu.a
+
+libx86emu_a_SOURCES = debug.c  decode.c  fpu.c  ops2.c  ops.c  prim_ops.c  sys.c  validate.c
+
+INCLUDES = 
+
+AM_CFLAGS = $(XORG_CFLAGS)
+