svn merge ^/branches/released .

1 files changed, 145 insertions, 142 deletions

diff --git a/xorg-server/include/xorg-config.h.in b/xorg-server/include/xorg-config.h.in
index 8946a6538..f2494af78 100644
--- a/xorg-server/include/xorg-config.h.in
+++ b/xorg-server/include/xorg-config.h.in
@@ -1,142 +1,145 @@
-/* xorg-config.h.in: not at all generated.                      -*- c -*-
- * 
- * This file differs from xorg-server.h.in in that -server is installed
- * with the rest of the SDK for external drivers/modules to use, whereas
- * -config is for internal use only (i.e. building the DDX).
- *
- */
-
-#ifndef _XORG_CONFIG_H_
-#define _XORG_CONFIG_H_
-
-#include <dix-config.h>
-#include <xkb-config.h>
-
-/* Building Xorg server. */
-#undef XORGSERVER
-
-/* Current X.Org version. */
-#undef XORG_VERSION_CURRENT
-
-/* Name of X server. */
-#undef __XSERVERNAME__
-
-/* URL to go to for support. */
-#undef __VENDORDWEBSUPPORT__
-
-/* Built-in output drivers. */
-#undef DRIVERS
-
-/* Built-in input drivers. */
-#undef IDRIVERS
-
-/* Path to configuration file. */
-#undef XF86CONFIGFILE
-
-/* Path to configuration file. */
-#undef __XCONFIGFILE__
-
-/* Name of configuration directory. */
-#undef __XCONFIGDIR__
-
-/* Path to loadable modules. */
-#undef DEFAULT_MODULE_PATH
-
-/* Path to installed libraries. */
-#undef DEFAULT_LIBRARY_PATH
-
-/* Path to server log file. */
-#undef DEFAULT_LOGPREFIX
-
-/* Building DRI-capable DDX. */
-#undef XF86DRI
-
-/* Build DRI2 extension */
-#undef DRI2
-
-/* Define to 1 if you have the <stropts.h> header file. */
-#undef HAVE_STROPTS_H
-
-/* Define to 1 if you have the <sys/kd.h> header file. */
-#undef HAVE_SYS_KD_H
-
-/* Define to 1 if you have the <sys/vt.h> header file. */
-#undef HAVE_SYS_VT_H
-
-/* 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
-
-/* System has /dev/xf86 aperture driver */
-#undef HAS_APERTURE_DRV
-
-/* Has backtrace support */
-#undef HAVE_BACKTRACE
-
-/* Name of the period field in struct kbd_repeat */
-#undef LNX_KBD_PERIOD_NAME
-
-/* Have execinfo.h */
-#undef HAVE_EXECINFO_H
-
-/* Have pci_system_init_dev_mem() */
-#undef HAVE_PCI_SYSTEM_INIT_DEV_MEM
-
-/* Define to 1 if you have the `pci_device_is_boot_vga' function. */
-#undef HAVE_PCI_DEVICE_IS_BOOT_VGA
-
-/* Have pci_enable_device */
-#undef HAVE_PCI_DEVICE_ENABLE
-
-/* Define to 1 if you have the `pci_device_vgaarb_init' function. */
-#undef HAVE_PCI_DEVICE_VGAARB_INIT
-
-/* Path to text files containing PCI IDs */
-#undef PCI_TXT_IDS_PATH
-
-/* Use SIGIO handlers for input device events by default */
-#undef USE_SIGIO_BY_DEFAULT
-
-/* Support PC98 */
-#undef SUPPORT_PC98
-
-#endif /* _XORG_CONFIG_H_ */
+/* xorg-config.h.in: not at all generated.                      -*- c -*-

+ * 

+ * This file differs from xorg-server.h.in in that -server is installed

+ * with the rest of the SDK for external drivers/modules to use, whereas

+ * -config is for internal use only (i.e. building the DDX).

+ *

+ */

+

+#ifndef _XORG_CONFIG_H_

+#define _XORG_CONFIG_H_

+

+#include <dix-config.h>

+#include <xkb-config.h>

+

+/* Building Xorg server. */

+#undef XORGSERVER

+

+/* Current X.Org version. */

+#undef XORG_VERSION_CURRENT

+

+/* Name of X server. */

+#undef __XSERVERNAME__

+

+/* URL to go to for support. */

+#undef __VENDORDWEBSUPPORT__

+

+/* Built-in output drivers. */

+#undef DRIVERS

+

+/* Built-in input drivers. */

+#undef IDRIVERS

+

+/* Path to configuration file. */

+#undef XF86CONFIGFILE

+

+/* Path to configuration file. */

+#undef __XCONFIGFILE__

+

+/* Name of configuration directory. */

+#undef __XCONFIGDIR__

+

+/* Path to loadable modules. */

+#undef DEFAULT_MODULE_PATH

+

+/* Path to installed libraries. */

+#undef DEFAULT_LIBRARY_PATH

+

+/* Path to server log file. */

+#undef DEFAULT_LOGPREFIX

+

+/* Building DRI-capable DDX. */

+#undef XF86DRI

+

+/* Build DRI2 extension */

+#undef DRI2

+

+/* Define to 1 if you have the <stropts.h> header file. */

+#undef HAVE_STROPTS_H

+

+/* Define to 1 if you have the <sys/kd.h> header file. */

+#undef HAVE_SYS_KD_H

+

+/* Define to 1 if you have the <sys/vt.h> header file. */

+#undef HAVE_SYS_VT_H

+

+/* 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

+

+/* System has /dev/xf86 aperture driver */

+#undef HAS_APERTURE_DRV

+

+/* Has backtrace support */

+#undef HAVE_BACKTRACE

+

+/* Name of the period field in struct kbd_repeat */

+#undef LNX_KBD_PERIOD_NAME

+

+/* Have execinfo.h */

+#undef HAVE_EXECINFO_H

+

+/* Have pci_system_init_dev_mem() */

+#undef HAVE_PCI_SYSTEM_INIT_DEV_MEM

+

+/* Define to 1 if you have the `pci_device_is_boot_vga' function. */

+#undef HAVE_PCI_DEVICE_IS_BOOT_VGA

+

+/* Have pci_enable_device */

+#undef HAVE_PCI_DEVICE_ENABLE

+

+/* Define to 1 if you have the `pci_device_vgaarb_init' function. */

+#undef HAVE_PCI_DEVICE_VGAARB_INIT

+

+/* Path to text files containing PCI IDs */

+#undef PCI_TXT_IDS_PATH

+

+/* Use SIGIO handlers for input device events by default */

+#undef USE_SIGIO_BY_DEFAULT

+

+/* Support PC98 */

+#undef SUPPORT_PC98

+

+/* Build with libdrm support */

+#undef WITH_LIBDRM

+

+#endif /* _XORG_CONFIG_H_ */