diff options
| author | Eric Anholt <anholt@freebsd.org> | 2006-02-12 10:30:47 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2006-02-12 10:30:47 +0000 |
| commit | 5f45776ef3b9256bea44842d1c50f269422531a1 (patch) | |
| tree | 0b36dcd5dafb0dc0d5ff32954a4e0e9c65a77458 | |
| parent | 5249416d091d59c248c8dda44529b8aa4910b1a0 (diff) | |
Add missing HAVE_DIX_CONFIG_H which caused issues with mismatched screen
structure interpretations, and remove a bunch of unused junk from
kdrive-config.h. Xephyr almost works on my amd64.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | hw/kdrive/linux/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/src/Makefile.am | 2 | ||||
| -rw-r--r-- | include/kdrive-config.h.in | 95 |
4 files changed, 12 insertions, 95 deletions
@@ -1,3 +1,12 @@ +2006-02-12 Eric Anholt <anholt@FreeBSD.org> + + * hw/kdrive/linux/Makefile.am: + * hw/kdrive/src/Makefile.am: + * include/kdrive-config.h.in: + Add missing HAVE_DIX_CONFIG_H which caused issues with mismatched screen + structure interpretations, and remove a bunch of unused junk from + kdrive-config.h. Xephyr almost works on my amd64. + 2006-02-11 Eric Anholt <anholt@FreeBSD.org> * hw/vfb/InitOutput.c: (xf86WrapperInit): diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am index 4243a1124..ddf1d4e4e 100644 --- a/hw/kdrive/linux/Makefile.am +++ b/hw/kdrive/linux/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ @KDRIVE_CFLAGS@ +AM_CFLAGS = -DHAVE_DIX_CONFIG_H noinst_LIBRARIES = liblinux.a diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am index 872d29551..53d50950d 100644 --- a/hw/kdrive/src/Makefile.am +++ b/hw/kdrive/src/Makefile.am @@ -2,6 +2,8 @@ INCLUDES = \ @KDRIVE_INCS@ \ @KDRIVE_CFLAGS@ +AM_CFLAGS = -DHAVE_DIX_CONFIG_H + noinst_LIBRARIES = libkdrive.a libkdrivestubs.a if KDRIVE_HW diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in index b3c5e37fb..621d62e5c 100644 --- a/include/kdrive-config.h.in +++ b/include/kdrive-config.h.in @@ -10,99 +10,4 @@ /* Building kdrive server. */ #undef KDRIVESERVER -/* Build GLX extension */ -#undef GLXEXT - -#if 0 - -/* Need XFree86 libc-replacement typedefs. */ -#undef NEED_XF86_TYPES - -/* Need XFree86 libc-replacement functions. */ -#undef NEED_XF86_PROTOTYPES - -/* Name of X server. */ -#undef __XSERVERNAME__ - -/* URL to go to for support. */ -#undef __VENDORDWEBSUPPORT__ - -/* Prefer dlloader modules to elfloader */ -#undef DLOPEN_HACK - -/* Use libdl-based loader. */ -#undef DLOPEN_SUPPORT - -/* Built-in output drivers. */ -#undef DRIVERS - -/* Built-in input drivers. */ -#undef IDRIVERS - -/* Path to configuration file. */ -#undef XF86CONFIGFILE - -/* Path to configuration file. */ -#undef __XCONFIGFILE__ - -/* Path to loadable modules. */ -#undef DEFAULT_MODULE_PATH - -/* Path to server log file. */ -#undef DEFAULT_LOGPREFIX - -/* Building DRI-capable DDX. */ -#undef XF86DRI - -/* Solaris 8 or later? */ -#undef __SOL8__ - -/* Whether to use pixmap privates */ -#undef PIXPRIV - -/* Define to 1 if you have the `walkcontext' function (used on Solaris for - xorg_backtrace in hw/xfree86/common/xf86Events.c */ -#undef HAVE_WALKCONTEXT - -/* Define to 1 if unsigned long is 64 bits. */ -#undef _XSERVER64 - -/* Building vgahw module */ -#undef WITH_VGAHW - -/* Define to 1 if NetBSD built-in MTRR support is available */ -#undef HAS_MTRR_BUILTIN - -/* Define to 1 if BSD MTRR support is available */ -#undef HAS_MTRR_SUPPORT - -/* NetBSD PIO alpha IO */ -#undef USE_ALPHA_PIO - -/* BSD AMD64 iopl */ -#undef USE_AMD64_IOPL - -/* BSD /dev/io */ -#undef USE_DEV_IO - -/* BSD i386 iopl */ -#undef USE_I386_IOPL - -/* System is BSD-like */ -#undef CSRG_BASED - -/* System has PC console */ -#undef PCCONS_SUPPORT - -/* System has PCVT console */ -#undef PCVT_SUPPORT - -/* System has syscons console */ -#undef SYSCONS_SUPPORT - -/* System has wscons console */ -#undef WSCONS_SUPPORT - -#endif /* 0 */ - #endif /* _XORG_CONFIG_H_ */ |