diff options
Diffstat (limited to 'xserver')
171 files changed, 495 insertions, 121 deletions
diff --git a/xserver/GL/Makefile.in b/xserver/GL/Makefile.in index 8eca96bf6..5b47aa558 100644 --- a/xserver/GL/Makefile.in +++ b/xserver/GL/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/glx/Makefile.in b/xserver/GL/glx/Makefile.in index 32c97cc88..51f8c1037 100644 --- a/xserver/GL/glx/Makefile.in +++ b/xserver/GL/glx/Makefile.in @@ -234,6 +234,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/Makefile.in b/xserver/GL/mesa/Makefile.in index d79da4b62..ae8c2e121 100644 --- a/xserver/GL/mesa/Makefile.in +++ b/xserver/GL/mesa/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/X/Makefile.in b/xserver/GL/mesa/X/Makefile.in index 8d28391c4..eb9ba73a8 100644 --- a/xserver/GL/mesa/X/Makefile.in +++ b/xserver/GL/mesa/X/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/array_cache/Makefile.in b/xserver/GL/mesa/array_cache/Makefile.in index 6ece7b8c6..fd1d5c741 100644 --- a/xserver/GL/mesa/array_cache/Makefile.in +++ b/xserver/GL/mesa/array_cache/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/glapi/Makefile.in b/xserver/GL/mesa/glapi/Makefile.in index 4d1f185d2..0e3c17c78 100644 --- a/xserver/GL/mesa/glapi/Makefile.in +++ b/xserver/GL/mesa/glapi/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/main/Makefile.in b/xserver/GL/mesa/main/Makefile.in index 5b8604ebd..546a7bfab 100644 --- a/xserver/GL/mesa/main/Makefile.in +++ b/xserver/GL/mesa/main/Makefile.in @@ -63,12 +63,12 @@ nodist_libmain_la_OBJECTS = accum.lo api_arrayelt.lo api_loopback.lo \ drawpix.lo enable.lo enums.lo eval.lo execmem.lo extensions.lo \ fbobject.lo feedback.lo fog.lo framebuffer.lo get.lo \ getstring.lo hash.lo hint.lo histogram.lo image.lo imports.lo \ - light.lo lines.lo matrix.lo mm.lo occlude.lo pixel.lo \ - points.lo polygon.lo rastpos.lo rbadaptors.lo renderbuffer.lo \ - state.lo stencil.lo texcompress.lo texcompress_fxt1.lo \ - texcompress_s3tc.lo texenvprogram.lo texformat.lo teximage.lo \ - texobj.lo texrender.lo texstate.lo texstore.lo varray.lo \ - $(am__objects_1) vtxfmt.lo + light.lo lines.lo matrix.lo mipmap.lo mm.lo occlude.lo \ + pixel.lo points.lo polygon.lo rastpos.lo rbadaptors.lo \ + renderbuffer.lo state.lo stencil.lo texcompress.lo \ + texcompress_fxt1.lo texcompress_s3tc.lo texenvprogram.lo \ + texformat.lo teximage.lo texobj.lo texrender.lo texstate.lo \ + texstore.lo varray.lo $(am__objects_1) vtxfmt.lo libmain_la_OBJECTS = $(nodist_libmain_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ @@ -603,6 +605,7 @@ nodist_libmain_la_SOURCES = accum.c \ light.c \ lines.c \ matrix.c \ + mipmap.c \ mm.c \ occlude.c \ pixel.c \ @@ -716,6 +719,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mipmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occlude.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel.Plo@am__quote@ diff --git a/xserver/GL/mesa/math/Makefile.in b/xserver/GL/mesa/math/Makefile.in index 7bd9a1331..1866d9e31 100644 --- a/xserver/GL/mesa/math/Makefile.in +++ b/xserver/GL/mesa/math/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/shader/Makefile.in b/xserver/GL/mesa/shader/Makefile.in index b20d2f010..a431ca313 100644 --- a/xserver/GL/mesa/shader/Makefile.in +++ b/xserver/GL/mesa/shader/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/shader/grammar/Makefile.in b/xserver/GL/mesa/shader/grammar/Makefile.in index 7e56d3359..902660030 100644 --- a/xserver/GL/mesa/shader/grammar/Makefile.in +++ b/xserver/GL/mesa/shader/grammar/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/shader/slang/Makefile.in b/xserver/GL/mesa/shader/slang/Makefile.in index 85ef673ea..a9db11b67 100644 --- a/xserver/GL/mesa/shader/slang/Makefile.in +++ b/xserver/GL/mesa/shader/slang/Makefile.in @@ -229,6 +229,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/swrast/Makefile.in b/xserver/GL/mesa/swrast/Makefile.in index c3ba183e9..62bf7a629 100644 --- a/xserver/GL/mesa/swrast/Makefile.in +++ b/xserver/GL/mesa/swrast/Makefile.in @@ -226,6 +226,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/swrast_setup/Makefile.in b/xserver/GL/mesa/swrast_setup/Makefile.in index 988d6008b..356e8d172 100644 --- a/xserver/GL/mesa/swrast_setup/Makefile.in +++ b/xserver/GL/mesa/swrast_setup/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/GL/mesa/tnl/Makefile.in b/xserver/GL/mesa/tnl/Makefile.in index 53984f969..dcc104b0b 100644 --- a/xserver/GL/mesa/tnl/Makefile.in +++ b/xserver/GL/mesa/tnl/Makefile.in @@ -227,6 +227,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/Makefile.in b/xserver/Makefile.in index 78b31f881..d95495778 100644 --- a/xserver/Makefile.in +++ b/xserver/Makefile.in @@ -237,6 +237,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/XTrap/Makefile.in b/xserver/XTrap/Makefile.in index 3c8b72fc5..ea85b94ce 100644 --- a/xserver/XTrap/Makefile.in +++ b/xserver/XTrap/Makefile.in @@ -221,6 +221,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/Xext/Makefile.in b/xserver/Xext/Makefile.in index 8652a290f..b26bd96c8 100644 --- a/xserver/Xext/Makefile.in +++ b/xserver/Xext/Makefile.in @@ -326,6 +326,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/Xi/Makefile.in b/xserver/Xi/Makefile.in index 17a9ddd6a..30817d60a 100644 --- a/xserver/Xi/Makefile.in +++ b/xserver/Xi/Makefile.in @@ -227,6 +227,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/aclocal.m4 b/xserver/aclocal.m4 index d4fe13856..3098a2baf 100644 --- a/xserver/aclocal.m4 +++ b/xserver/aclocal.m4 @@ -7454,7 +7454,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.4 + [XORG_MACROS_version=1.1.5 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then diff --git a/xserver/afb/Makefile.in b/xserver/afb/Makefile.in index bf16b2afe..c5c607763 100644 --- a/xserver/afb/Makefile.in +++ b/xserver/afb/Makefile.in @@ -240,6 +240,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/cfb/Makefile.in b/xserver/cfb/Makefile.in index bb507ac0c..52f0f83d7 100644 --- a/xserver/cfb/Makefile.in +++ b/xserver/cfb/Makefile.in @@ -245,6 +245,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/cfb32/Makefile.in b/xserver/cfb32/Makefile.in index 3531607e5..2e4eef6ec 100644 --- a/xserver/cfb32/Makefile.in +++ b/xserver/cfb32/Makefile.in @@ -234,6 +234,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/composite/Makefile.in b/xserver/composite/Makefile.in index 9e03338a9..8eba3cef6 100644 --- a/xserver/composite/Makefile.in +++ b/xserver/composite/Makefile.in @@ -221,6 +221,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/configure b/xserver/configure index 5fb3bd7cf..e5017342d 100644 --- a/xserver/configure +++ b/xserver/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xorg-server 1.1.99.903. +# Generated by GNU Autoconf 2.59 for xorg-server 1.2.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.1.99.903' -PACKAGE_STRING='xorg-server 1.1.99.903' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='xorg-server 1.2.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LEX LEXLIB LEX_OUTPUT_ROOT YACC RAWCPP RAWCPPFLAGS ALLOCA NEED_STRLCAT_TRUE NEED_STRLCAT_FALSE NEED_VSNPRINTF_TRUE NEED_VSNPRINTF_FALSE AGP_TRUE AGP_FALSE LNXAPM_TRUE LNXAPM_FALSE FBDEVHW_TRUE FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE ARM_VIDEO_FALSE HP300_VIDEO_TRUE HP300_VIDEO_FALSE HPPA_VIDEO_TRUE HPPA_VIDEO_FALSE I386_VIDEO_TRUE I386_VIDEO_FALSE PPC_VIDEO_TRUE PPC_VIDEO_FALSE SPARC64_VIDEO_TRUE SPARC64_VIDEO_FALSE KDRIVE_HW_TRUE KDRIVE_HW_FALSE MMX_CAPABLE_TRUE MMX_CAPABLE_FALSE X_PRIVSEP_TRUE X_PRIVSEP_FALSE INSTALL_SETUID_TRUE INSTALL_SETUID_FALSE INT10_VM86_TRUE INT10_VM86_FALSE INT10_X86EMU_TRUE INT10_X86EMU_FALSE INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML INSTALL_LIBXF86CONFIG_TRUE INSTALL_LIBXF86CONFIG_FALSE XV_TRUE XV_FALSE XVMC_TRUE XVMC_FALSE DGA_TRUE DGA_FALSE COMPOSITE_TRUE COMPOSITE_FALSE MITSHM_TRUE MITSHM_FALSE XTRAP_TRUE XTRAP_FALSE RECORD_TRUE RECORD_FALSE SCREENSAVER_TRUE SCREENSAVER_FALSE RES_TRUE RES_FALSE XLIB_CFLAGS XLIB_LIBS GL_CFLAGS GL_LIBS GLX_TRUE GLX_FALSE MESA_SOURCE AIGLX_TRUE AIGLX_FALSE GLX_DEFINES DRI_TRUE DRI_FALSE DRIPROTO_CFLAGS DRIPROTO_LIBS LIBDRM_CFLAGS LIBDRM_LIBS XINERAMA_TRUE XINERAMA_FALSE XACE_TRUE XACE_FALSE XCSECURITY_TRUE XCSECURITY_FALSE XEVIE_TRUE XEVIE_FALSE APPGROUP_TRUE APPGROUP_FALSE CUP_TRUE CUP_FALSE EVI_TRUE EVI_FALSE MULTIBUFFER_TRUE MULTIBUFFER_FALSE FONTCACHE_TRUE FONTCACHE_FALSE DBE_TRUE DBE_FALSE XF86BIGFONT_TRUE XF86BIGFONT_FALSE DPMSExtension_TRUE DPMSExtension_FALSE XPRINTPROTO_CFLAGS XPRINTPROTO_LIBS XPRINT_TRUE XPRINT_FALSE XCALIBRATE_TRUE XCALIBRATE_FALSE XINPUT_TRUE XINPUT_FALSE XF86UTILS_TRUE XF86UTILS_FALSE XDMCP_CFLAGS XDMCP_LIBS XDMCP_TRUE XDMCP_FALSE XDMAUTH_TRUE XDMAUTH_FALSE USE_RGB_BUILTIN_TRUE USE_RGB_BUILTIN_FALSE COMPILEDDEFAULTFONTPATH RGB_DB BASE_FONT_PATH DRI_DRIVER_PATH VENDOR_STRING VENDOR_STRING_SHORT VENDOR_RELEASE VENDOR_MAN_VERSION DEBUG_TRUE DEBUG_FALSE XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS SYS_LIBS XSERVER_LIBS DMXMODULES_CFLAGS DMXMODULES_LIBS DMX_TRUE DMX_FALSE XDMX_LIBS XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS DMX_BUILD_LNX_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_USB_FALSE XVFB_TRUE XVFB_FALSE XVFB_LIBS XNESTMODULES_CFLAGS XNESTMODULES_LIBS XNEST_TRUE XNEST_FALSE XNEST_LIBS XGLMODULES_CFLAGS XGLMODULES_LIBS XGL_TRUE XGL_FALSE XGL_LIBS xglmoduledir XGL_MODULE_PATH XEGLMODULES_CFLAGS XEGLMODULES_LIBS XEGL_TRUE XEGL_FALSE XEGL_LIBS XGLXMODULES_CFLAGS XGLXMODULES_LIBS XGLX_TRUE XGLX_FALSE XGLX_LIBS XORG_CORE_LIBS SOLARIS_INOUT_ARCH SOLARIS_ASM_CFLAGS XORG_LIBS XORG_INCS XORG_OS XORG_OS_SUBDIR XORG_OS_KBD PERL XORG_CFLAGS LD_EXPORT_SYMBOLS_FLAG __XCONFIGFILE__ XF86CONFIGFILE DEFAULT_MODULE_PATH DEFAULT_LIBRARY_PATH DEFAULT_LOGPREFIX moduledir driverdir sdkdir extdir logdir XORG_TRUE XORG_FALSE XORG_BUS_LINUXPCI_TRUE XORG_BUS_LINUXPCI_FALSE XORG_BUS_FREEBSDPCI_TRUE XORG_BUS_FREEBSDPCI_FALSE XORG_BUS_NETBSDPCI_TRUE XORG_BUS_NETBSDPCI_FALSE XORG_BUS_IX86PCI_TRUE XORG_BUS_IX86PCI_FALSE XORG_BUS_PPCPCI_TRUE XORG_BUS_PPCPCI_FALSE XORG_BUS_SPARCPCI_TRUE XORG_BUS_SPARCPCI_FALSE XORG_BUS_SPARC_TRUE XORG_BUS_SPARC_FALSE XORG_LOADER_SPARC_TRUE XORG_LOADER_SPARC_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE LINUX_ALPHA_TRUE LINUX_ALPHA_FALSE LNXACPI_TRUE LNXACPI_FALSE SOLARIS_USL_CONSOLE_TRUE SOLARIS_USL_CONSOLE_FALSE SOLARIS_ASM_INLINE_TRUE SOLARIS_ASM_INLINE_FALSE MFB_TRUE MFB_FALSE CFB_TRUE CFB_FALSE AFB_TRUE AFB_FALSE XPRINT_CFLAGS XPRINT_LIBS xpconfigdir MKFONTSCALE MKFONTDIR FREETYPE_CFLAGS FREETYPE_LIBS ft_config FREETYPE_REQUIRES XP_USE_FREETYPE_TRUE XP_USE_FREETYPE_FALSE XWIN_LIBS XWINMODULES_CFLAGS XWINMODULES_LIBS XWIN_SERVER_NAME XWIN_SYSTEM_LIBS XWIN_TRUE XWIN_FALSE XWIN_MULTIWINDOW_TRUE XWIN_MULTIWINDOW_FALSE XWIN_MULTIWINDOWEXTWM_TRUE XWIN_MULTIWINDOWEXTWM_FALSE XWIN_CLIPBOARD_TRUE XWIN_CLIPBOARD_FALSE XWIN_GLX_WINDOWS_TRUE XWIN_GLX_WINDOWS_FALSE XWIN_NATIVEGDI_TRUE XWIN_NATIVEGDI_FALSE XWIN_PRIMARYFB_TRUE XWIN_PRIMARYFB_FALSE XWIN_RANDR_TRUE XWIN_RANDR_FALSE XWIN_XV_TRUE XWIN_XV_FALSE KDRIVE_TRUE KDRIVE_FALSE TSLIB_CFLAGS TSLIB_LIBS XEPHYR_CFLAGS XEPHYR_LIBS KDRIVE_INCS KDRIVE_PURE_INCS KDRIVE_CFLAGS KDRIVE_PURE_LIBS KDRIVE_LIBS TSLIB_TRUE TSLIB_FALSE H3600_TS_TRUE H3600_TS_FALSE KDRIVEVESA_TRUE KDRIVEVESA_FALSE KDRIVEFBDEV_TRUE KDRIVEFBDEV_FALSE XEPHYR_TRUE XEPHYR_FALSE XEPHYR_INCS XSDLSERVER_TRUE XSDLSERVER_FALSE XSDL_LIBS XSDL_INCS XKB_BASE_DIRECTORY XKB_BIN_DIRECTORY XKM_OUTPUT_DIR XKB_COMPILED_DIR PROJECTROOT XORGCONFIG_DEP_CFLAGS XORGCONFIG_DEP_LIBS XORGCFG_DEP_CFLAGS XORGCFG_DEP_LIBS APPDEFAULTDIR BUILD_XORGCFG_TRUE BUILD_XORGCFG_FALSE USE_CURSES_TRUE USE_CURSES_FALSE BUILD_KBD_MODE_TRUE BUILD_KBD_MODE_FALSE BSD_KBD_MODE_TRUE BSD_KBD_MODE_FALSE SUN_KBD_MODE_TRUE SUN_KBD_MODE_FALSE BUILD_DATE DIX_CFLAGS libdir exec_prefix prefix APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LEX LEXLIB LEX_OUTPUT_ROOT YACC RAWCPP RAWCPPFLAGS ALLOCA NEED_STRLCAT_TRUE NEED_STRLCAT_FALSE NEED_VSNPRINTF_TRUE NEED_VSNPRINTF_FALSE AGP_TRUE AGP_FALSE LNXAPM_TRUE LNXAPM_FALSE FBDEVHW_TRUE FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE ARM_VIDEO_FALSE HP300_VIDEO_TRUE HP300_VIDEO_FALSE HPPA_VIDEO_TRUE HPPA_VIDEO_FALSE I386_VIDEO_TRUE I386_VIDEO_FALSE PPC_VIDEO_TRUE PPC_VIDEO_FALSE SPARC64_VIDEO_TRUE SPARC64_VIDEO_FALSE KDRIVE_HW_TRUE KDRIVE_HW_FALSE MMX_CAPABLE_TRUE MMX_CAPABLE_FALSE X_PRIVSEP_TRUE X_PRIVSEP_FALSE INSTALL_SETUID_TRUE INSTALL_SETUID_FALSE INT10_VM86_TRUE INT10_VM86_FALSE INT10_X86EMU_TRUE INT10_X86EMU_FALSE INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML INSTALL_LIBXF86CONFIG_TRUE INSTALL_LIBXF86CONFIG_FALSE XV_TRUE XV_FALSE XVMC_TRUE XVMC_FALSE DGA_TRUE DGA_FALSE COMPOSITE_TRUE COMPOSITE_FALSE MITSHM_TRUE MITSHM_FALSE XTRAP_TRUE XTRAP_FALSE RECORD_TRUE RECORD_FALSE SCREENSAVER_TRUE SCREENSAVER_FALSE RES_TRUE RES_FALSE XLIB_CFLAGS XLIB_LIBS GL_CFLAGS GL_LIBS GLX_TRUE GLX_FALSE MESA_SOURCE AIGLX_TRUE AIGLX_FALSE GLX_DEFINES DRI_TRUE DRI_FALSE DRIPROTO_CFLAGS DRIPROTO_LIBS LIBDRM_CFLAGS LIBDRM_LIBS XINERAMA_TRUE XINERAMA_FALSE XACE_TRUE XACE_FALSE XCSECURITY_TRUE XCSECURITY_FALSE XEVIE_TRUE XEVIE_FALSE APPGROUP_TRUE APPGROUP_FALSE CUP_TRUE CUP_FALSE EVI_TRUE EVI_FALSE MULTIBUFFER_TRUE MULTIBUFFER_FALSE FONTCACHE_TRUE FONTCACHE_FALSE DBE_TRUE DBE_FALSE XF86BIGFONT_TRUE XF86BIGFONT_FALSE DPMSExtension_TRUE DPMSExtension_FALSE XPRINTPROTO_CFLAGS XPRINTPROTO_LIBS XPRINT_TRUE XPRINT_FALSE XCALIBRATE_TRUE XCALIBRATE_FALSE XINPUT_TRUE XINPUT_FALSE XF86UTILS_TRUE XF86UTILS_FALSE XDMCP_CFLAGS XDMCP_LIBS XDMCP_TRUE XDMCP_FALSE XDMAUTH_TRUE XDMAUTH_FALSE USE_RGB_BUILTIN_TRUE USE_RGB_BUILTIN_FALSE COMPILEDDEFAULTFONTPATH RGB_DB BASE_FONT_PATH DRI_DRIVER_PATH VENDOR_STRING VENDOR_STRING_SHORT VENDOR_RELEASE VENDOR_MAN_VERSION DEBUG_TRUE DEBUG_FALSE XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS SYS_LIBS XSERVER_LIBS DMXMODULES_CFLAGS DMXMODULES_LIBS DMX_TRUE DMX_FALSE XDMX_LIBS XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS DMX_BUILD_LNX_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_USB_FALSE XVFB_TRUE XVFB_FALSE XVFB_LIBS XNESTMODULES_CFLAGS XNESTMODULES_LIBS XNEST_TRUE XNEST_FALSE XNEST_LIBS XGLMODULES_CFLAGS XGLMODULES_LIBS XGL_TRUE XGL_FALSE XGL_LIBS xglmoduledir XGL_MODULE_PATH XEGLMODULES_CFLAGS XEGLMODULES_LIBS XEGL_TRUE XEGL_FALSE XEGL_LIBS XGLXMODULES_CFLAGS XGLXMODULES_LIBS XGLX_TRUE XGLX_FALSE XGLX_LIBS XORG_CORE_LIBS SOLARIS_INOUT_ARCH SOLARIS_ASM_CFLAGS XORG_LIBS XORG_INCS XORG_OS XORG_OS_SUBDIR XORG_OS_KBD PERL XORG_CFLAGS LD_EXPORT_SYMBOLS_FLAG __XCONFIGFILE__ XF86CONFIGFILE DEFAULT_MODULE_PATH DEFAULT_LIBRARY_PATH DEFAULT_LOGPREFIX moduledir driverdir sdkdir extdir logdir XORG_TRUE XORG_FALSE XORG_BUS_LINUXPCI_TRUE XORG_BUS_LINUXPCI_FALSE XORG_BUS_FREEBSDPCI_TRUE XORG_BUS_FREEBSDPCI_FALSE XORG_BUS_NETBSDPCI_TRUE XORG_BUS_NETBSDPCI_FALSE XORG_BUS_IX86PCI_TRUE XORG_BUS_IX86PCI_FALSE XORG_BUS_PPCPCI_TRUE XORG_BUS_PPCPCI_FALSE XORG_BUS_SPARCPCI_TRUE XORG_BUS_SPARCPCI_FALSE XORG_BUS_SPARC_TRUE XORG_BUS_SPARC_FALSE XORG_LOADER_SPARC_TRUE XORG_LOADER_SPARC_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE LINUX_ALPHA_TRUE LINUX_ALPHA_FALSE LNXACPI_TRUE LNXACPI_FALSE SOLARIS_USL_CONSOLE_TRUE SOLARIS_USL_CONSOLE_FALSE SOLARIS_ASM_INLINE_TRUE SOLARIS_ASM_INLINE_FALSE MFB_TRUE MFB_FALSE CFB_TRUE CFB_FALSE AFB_TRUE AFB_FALSE XPRINT_CFLAGS XPRINT_LIBS xpconfigdir MKFONTSCALE MKFONTDIR FREETYPE_CFLAGS FREETYPE_LIBS ft_config FREETYPE_REQUIRES XP_USE_FREETYPE_TRUE XP_USE_FREETYPE_FALSE XWIN_LIBS XWINMODULES_CFLAGS XWINMODULES_LIBS XWIN_SERVER_NAME XWIN_SYSTEM_LIBS XWIN_TRUE XWIN_FALSE XWIN_MULTIWINDOW_TRUE XWIN_MULTIWINDOW_FALSE XWIN_MULTIWINDOWEXTWM_TRUE XWIN_MULTIWINDOWEXTWM_FALSE XWIN_CLIPBOARD_TRUE XWIN_CLIPBOARD_FALSE XWIN_GLX_WINDOWS_TRUE XWIN_GLX_WINDOWS_FALSE XWIN_NATIVEGDI_TRUE XWIN_NATIVEGDI_FALSE XWIN_PRIMARYFB_TRUE XWIN_PRIMARYFB_FALSE XWIN_RANDR_TRUE XWIN_RANDR_FALSE XWIN_XV_TRUE XWIN_XV_FALSE KDRIVE_TRUE KDRIVE_FALSE TSLIB_CFLAGS TSLIB_LIBS XEPHYR_CFLAGS XEPHYR_LIBS KDRIVE_INCS KDRIVE_PURE_INCS KDRIVE_CFLAGS KDRIVE_PURE_LIBS KDRIVE_LIBS KDRIVELINUX_TRUE KDRIVELINUX_FALSE TSLIB_TRUE TSLIB_FALSE H3600_TS_TRUE H3600_TS_FALSE KDRIVEVESA_TRUE KDRIVEVESA_FALSE KDRIVEFBDEV_TRUE KDRIVEFBDEV_FALSE XEPHYR_TRUE XEPHYR_FALSE XEPHYR_INCS XSDLSERVER_TRUE XSDLSERVER_FALSE XSDL_LIBS XSDL_INCS XKB_BASE_DIRECTORY XKB_BIN_DIRECTORY XKM_OUTPUT_DIR XKB_COMPILED_DIR PROJECTROOT XORGCONFIG_DEP_CFLAGS XORGCONFIG_DEP_LIBS XORGCFG_DEP_CFLAGS XORGCFG_DEP_LIBS APPDEFAULTDIR BUILD_XORGCFG_TRUE BUILD_XORGCFG_FALSE USE_CURSES_TRUE USE_CURSES_FALSE BUILD_KBD_MODE_TRUE BUILD_KBD_MODE_FALSE BSD_KBD_MODE_TRUE BSD_KBD_MODE_FALSE SUN_KBD_MODE_TRUE SUN_KBD_MODE_FALSE BUILD_DATE DIX_CFLAGS libdir exec_prefix prefix APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1174,7 +1174,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.1.99.903 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1240,7 +1240,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.1.99.903:";; + short | recursive ) echo "Configuration of xorg-server 1.2.0:";; esac cat <<\_ACEOF @@ -1584,7 +1584,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.1.99.903 +xorg-server configure 1.2.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1598,7 +1598,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.1.99.903, which was +It was created by xorg-server $as_me 1.2.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -2242,7 +2242,7 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.1.99.903' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -23891,7 +23891,7 @@ int main () { -int main () { +{ int id; id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); if (id < 0) return -1; @@ -24466,10 +24466,10 @@ _ACEOF DEFAULT_VENDOR_NAME="The X.Org Foundation" DEFAULT_VENDOR_NAME_SHORT="X.Org" DEFAULT_VERSION_MAJOR=7 -DEFAULT_VERSION_MINOR=1 -DEFAULT_VERSION_PATCH=99 -DEFAULT_VERSION_SNAP=903 -DEFAULT_RELEASE_DATE="1 December 2006" +DEFAULT_VERSION_MINOR=2 +DEFAULT_VERSION_PATCH=0 +DEFAULT_VERSION_SNAP=0 +DEFAULT_RELEASE_DATE="22 January 2007" DEFAULT_VENDOR_WEB="http://wiki.x.org" @@ -26538,12 +26538,12 @@ echo $ECHO_N "checking for GL... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5 - ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.8") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.7" 2>/dev/null` + pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.8" 2>/dev/null` else pkg_failed=yes fi @@ -26552,12 +26552,12 @@ else fi if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5 - ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.8") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.7" 2>/dev/null` + pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.8" 2>/dev/null` else pkg_failed=yes fi @@ -26566,18 +26566,18 @@ else fi if test $pkg_failed = yes; then - GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.7"` + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.8"` # Put the nasty error message in config.log where it belongs echo "$GL_PKG_ERRORS" 1>&5 - { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.7) were not met. + { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.8) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables to avoid the need to call pkg-config. See the pkg-config man page for more details." >&5 -echo "$as_me: error: Package requirements (glproto >= 1.4.7) were not met. +echo "$as_me: error: Package requirements (glproto >= 1.4.8) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. @@ -28359,12 +28359,12 @@ echo $ECHO_N "checking for DMXMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu xext x11 xrender xfont xi dmxproto xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu xext x11 xrender xfixes xfont xi dmxproto xau \$XDMCP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXMODULES_CFLAGS=`$PKG_CONFIG --cflags "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES" 2>/dev/null` + pkg_cv_DMXMODULES_CFLAGS=`$PKG_CONFIG --cflags "xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -28373,12 +28373,12 @@ else fi if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu xext x11 xrender xfont xi dmxproto xau \$XDMCP_MODULES\"") >&5 - ($PKG_CONFIG --exists --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu xext x11 xrender xfixes xfont xi dmxproto xau \$XDMCP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXMODULES_LIBS=`$PKG_CONFIG --libs "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES" 2>/dev/null` + pkg_cv_DMXMODULES_LIBS=`$PKG_CONFIG --libs "xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -28387,7 +28387,7 @@ else fi if test $pkg_failed = yes; then - DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES"` + DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES"` # Put the nasty error message in config.log where it belongs echo "$DMXMODULES_PKG_ERRORS" 1>&5 @@ -29990,10 +29990,6 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <linux/kd.h> -#ifdef __sparc__ -#include <asm/param.h> -#include <asm/kbio.h> -#endif int main () @@ -31826,7 +31822,12 @@ _ACEOF # $MIEXT_SHADOW_LIB $XPSTUBS_LIB" KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' - KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' + case $host_os in + *linux*) + KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' + KDRIVELINUX=yes + ;; + esac KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" @@ -32043,6 +32044,16 @@ fi +if test "x$KDRIVELINUX" = xyes; then + KDRIVELINUX_TRUE= + KDRIVELINUX_FALSE='#' +else + KDRIVELINUX_TRUE='#' + KDRIVELINUX_FALSE= +fi + + + if test "x$HAVE_TSLIB" = xyes; then TSLIB_TRUE= TSLIB_FALSE='#' @@ -32369,29 +32380,59 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -case $host_os in - cygwin*) ;; - solaris*) ;; - darwin*) ;; - freebsd*|netbsd*|openbsd*) ;; - *) - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <features.h> +#ifndef __GLIBC__ +#error not glibc +#endif -cat >>confdefs.h <<\_ACEOF -#define _XOPEN_SOURCE 500 -_ACEOF +int +main () +{ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF -#define _BSD_SOURCE 1 +#define _GNU_SOURCE 1 _ACEOF - ;; -esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext prefix_NONE= @@ -33697,6 +33738,13 @@ echo "$as_me: error: conditional \"KDRIVE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"KDRIVELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"KDRIVELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"TSLIB\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -34045,7 +34093,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xorg-server $as_me 1.1.99.903, which was +This file was extended by xorg-server $as_me 1.2.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34108,7 +34156,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xorg-server config.status 1.1.99.903 +xorg-server config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -34859,6 +34907,8 @@ s,@KDRIVE_PURE_INCS@,$KDRIVE_PURE_INCS,;t t s,@KDRIVE_CFLAGS@,$KDRIVE_CFLAGS,;t t s,@KDRIVE_PURE_LIBS@,$KDRIVE_PURE_LIBS,;t t s,@KDRIVE_LIBS@,$KDRIVE_LIBS,;t t +s,@KDRIVELINUX_TRUE@,$KDRIVELINUX_TRUE,;t t +s,@KDRIVELINUX_FALSE@,$KDRIVELINUX_FALSE,;t t s,@TSLIB_TRUE@,$TSLIB_TRUE,;t t s,@TSLIB_FALSE@,$TSLIB_FALSE,;t t s,@H3600_TS_TRUE@,$H3600_TS_TRUE,;t t diff --git a/xserver/damageext/Makefile.in b/xserver/damageext/Makefile.in index 50e21dba2..7292842fc 100644 --- a/xserver/damageext/Makefile.in +++ b/xserver/damageext/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/dbe/Makefile.in b/xserver/dbe/Makefile.in index 92ac8f4b8..475ee35de 100644 --- a/xserver/dbe/Makefile.in +++ b/xserver/dbe/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/dix/Makefile.in b/xserver/dix/Makefile.in index 1645d3286..f41e4b26e 100644 --- a/xserver/dix/Makefile.in +++ b/xserver/dix/Makefile.in @@ -227,6 +227,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in index d9c99ecc4..5c10d14f4 100644 --- a/xserver/doc/Makefile.in +++ b/xserver/doc/Makefile.in @@ -217,6 +217,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/exa/Makefile.in b/xserver/exa/Makefile.in index d65d27020..3346a2acd 100644 --- a/xserver/exa/Makefile.in +++ b/xserver/exa/Makefile.in @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/fb/Makefile.in b/xserver/fb/Makefile.in index d0fce7583..d0f7a1be0 100644 --- a/xserver/fb/Makefile.in +++ b/xserver/fb/Makefile.in @@ -242,6 +242,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/Makefile.in b/xserver/hw/Makefile.in index e183280a9..211c34337 100644 --- a/xserver/hw/Makefile.in +++ b/xserver/hw/Makefile.in @@ -210,6 +210,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/darwin/Makefile.in b/xserver/hw/darwin/Makefile.in index 6cb0efc8f..6d801219c 100644 --- a/xserver/hw/darwin/Makefile.in +++ b/xserver/hw/darwin/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/dmx/Makefile.in b/xserver/hw/dmx/Makefile.in index 3871ad78a..876884e8e 100644 --- a/xserver/hw/dmx/Makefile.in +++ b/xserver/hw/dmx/Makefile.in @@ -269,6 +269,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/dmx/config/Makefile.in b/xserver/hw/dmx/config/Makefile.in index 23a62c22f..a86bb9f52 100644 --- a/xserver/hw/dmx/config/Makefile.in +++ b/xserver/hw/dmx/config/Makefile.in @@ -253,6 +253,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/dmx/doc/Makefile.in b/xserver/hw/dmx/doc/Makefile.in index 24cb73bb1..b236212f8 100644 --- a/xserver/hw/dmx/doc/Makefile.in +++ b/xserver/hw/dmx/doc/Makefile.in @@ -225,6 +225,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/dmx/examples/Makefile.in b/xserver/hw/dmx/examples/Makefile.in index 9875bf1a2..2313b8020 100644 --- a/xserver/hw/dmx/examples/Makefile.in +++ b/xserver/hw/dmx/examples/Makefile.in @@ -280,6 +280,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/dmx/glxProxy/Makefile.in b/xserver/hw/dmx/glxProxy/Makefile.in index 2c99058cf..ad68c6b0a 100644 --- a/xserver/hw/dmx/glxProxy/Makefile.in +++ b/xserver/hw/dmx/glxProxy/Makefile.in @@ -228,6 +228,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/dmx/input/Makefile.in b/xserver/hw/dmx/input/Makefile.in index 42aef9bbc..4f2cfd294 100644 --- a/xserver/hw/dmx/input/Makefile.in +++ b/xserver/hw/dmx/input/Makefile.in @@ -242,6 +242,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/Makefile.in b/xserver/hw/kdrive/Makefile.in index d66c09a53..f6c7e0339 100644 --- a/xserver/hw/kdrive/Makefile.in +++ b/xserver/hw/kdrive/Makefile.in @@ -210,6 +210,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ @@ -528,9 +530,10 @@ xpconfigdir = @xpconfigdir@ @KDRIVEFBDEV_TRUE@FBDEV_SUBDIRS = fbdev @XSDLSERVER_TRUE@XSDL_SUBDIRS = sdl @XEPHYR_TRUE@XEPHYR_SUBDIRS = ephyr +@KDRIVELINUX_TRUE@LINUX_SUBDIRS = linux SUBDIRS = \ src \ - linux \ + $(LINUX_SUBDIRS) \ $(XSDL_SUBDIRS) \ $(FBDEV_SUBDIRS) \ $(VESA_SUBDIRS) \ diff --git a/xserver/hw/kdrive/ati/Makefile.in b/xserver/hw/kdrive/ati/Makefile.in index ec664f93b..4f15fe297 100644 --- a/xserver/hw/kdrive/ati/Makefile.in +++ b/xserver/hw/kdrive/ati/Makefile.in @@ -252,6 +252,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/chips/Makefile.in b/xserver/hw/kdrive/chips/Makefile.in index 0ea6f899c..ad06f1d84 100644 --- a/xserver/hw/kdrive/chips/Makefile.in +++ b/xserver/hw/kdrive/chips/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/ephyr/Makefile.in b/xserver/hw/kdrive/ephyr/Makefile.in index aae22b699..ace1ff67c 100644 --- a/xserver/hw/kdrive/ephyr/Makefile.in +++ b/xserver/hw/kdrive/ephyr/Makefile.in @@ -236,6 +236,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/epson/Makefile.in b/xserver/hw/kdrive/epson/Makefile.in index a8d4e2657..0db56db17 100644 --- a/xserver/hw/kdrive/epson/Makefile.in +++ b/xserver/hw/kdrive/epson/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/fake/Makefile.in b/xserver/hw/kdrive/fake/Makefile.in index 4cedec709..e0d2ad901 100644 --- a/xserver/hw/kdrive/fake/Makefile.in +++ b/xserver/hw/kdrive/fake/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/fbdev/Makefile.in b/xserver/hw/kdrive/fbdev/Makefile.in index 3a55a3a01..d77d12e2a 100644 --- a/xserver/hw/kdrive/fbdev/Makefile.in +++ b/xserver/hw/kdrive/fbdev/Makefile.in @@ -229,6 +229,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/i810/Makefile.in b/xserver/hw/kdrive/i810/Makefile.in index afb743e79..8c52c6eeb 100644 --- a/xserver/hw/kdrive/i810/Makefile.in +++ b/xserver/hw/kdrive/i810/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/linux/Makefile.in b/xserver/hw/kdrive/linux/Makefile.in index a3812603b..4ab427ddf 100644 --- a/xserver/hw/kdrive/linux/Makefile.in +++ b/xserver/hw/kdrive/linux/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/mach64/Makefile.in b/xserver/hw/kdrive/mach64/Makefile.in index 9cdae4848..78a4e2eb7 100644 --- a/xserver/hw/kdrive/mach64/Makefile.in +++ b/xserver/hw/kdrive/mach64/Makefile.in @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/mga/Makefile.in b/xserver/hw/kdrive/mga/Makefile.in index c73547af6..ebe0ce28c 100644 --- a/xserver/hw/kdrive/mga/Makefile.in +++ b/xserver/hw/kdrive/mga/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/neomagic/Makefile.in b/xserver/hw/kdrive/neomagic/Makefile.in index d8b1acb33..00fb6b505 100644 --- a/xserver/hw/kdrive/neomagic/Makefile.in +++ b/xserver/hw/kdrive/neomagic/Makefile.in @@ -237,6 +237,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/nvidia/Makefile.in b/xserver/hw/kdrive/nvidia/Makefile.in index 076d166e1..cf6c618de 100644 --- a/xserver/hw/kdrive/nvidia/Makefile.in +++ b/xserver/hw/kdrive/nvidia/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/pm2/Makefile.in b/xserver/hw/kdrive/pm2/Makefile.in index 0719d0f37..7bf9a9986 100644 --- a/xserver/hw/kdrive/pm2/Makefile.in +++ b/xserver/hw/kdrive/pm2/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/r128/Makefile.in b/xserver/hw/kdrive/r128/Makefile.in index 3c5ff5a07..f4472fa92 100644 --- a/xserver/hw/kdrive/r128/Makefile.in +++ b/xserver/hw/kdrive/r128/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/sdl/Makefile.in b/xserver/hw/kdrive/sdl/Makefile.in index 3cf5d2dae..0a5f3ae30 100644 --- a/xserver/hw/kdrive/sdl/Makefile.in +++ b/xserver/hw/kdrive/sdl/Makefile.in @@ -224,6 +224,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/sis300/Makefile.in b/xserver/hw/kdrive/sis300/Makefile.in index ae9ad5156..85ad6c1c4 100644 --- a/xserver/hw/kdrive/sis300/Makefile.in +++ b/xserver/hw/kdrive/sis300/Makefile.in @@ -236,6 +236,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/smi/Makefile.in b/xserver/hw/kdrive/smi/Makefile.in index 815b04fb6..533c80b19 100644 --- a/xserver/hw/kdrive/smi/Makefile.in +++ b/xserver/hw/kdrive/smi/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/src/Makefile.in b/xserver/hw/kdrive/src/Makefile.in index 9060b027d..9168e7467 100644 --- a/xserver/hw/kdrive/src/Makefile.in +++ b/xserver/hw/kdrive/src/Makefile.in @@ -237,6 +237,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/vesa/Makefile.in b/xserver/hw/kdrive/vesa/Makefile.in index 6d0b0526a..7f2d94341 100644 --- a/xserver/hw/kdrive/vesa/Makefile.in +++ b/xserver/hw/kdrive/vesa/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/kdrive/via/Makefile.in b/xserver/hw/kdrive/via/Makefile.in index 43f63156c..bab6b1367 100644 --- a/xserver/hw/kdrive/via/Makefile.in +++ b/xserver/hw/kdrive/via/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/vfb/Makefile.in b/xserver/hw/vfb/Makefile.in index eb4c466ea..573110a60 100644 --- a/xserver/hw/vfb/Makefile.in +++ b/xserver/hw/vfb/Makefile.in @@ -242,6 +242,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ @@ -573,7 +575,7 @@ Xvfb_LDFLAGS = AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ -DNO_HW_ONLY_EXTS \ -DNO_MODULE_EXTS \ - \ + -DXFree86Server \ $(XVFBMODULES_CFLAGS) SED = sed diff --git a/xserver/hw/xfree86/Makefile.in b/xserver/hw/xfree86/Makefile.in index 89091e647..8128569d9 100644 --- a/xserver/hw/xfree86/Makefile.in +++ b/xserver/hw/xfree86/Makefile.in @@ -255,6 +255,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/common/Makefile.in b/xserver/hw/xfree86/common/Makefile.in index fa19be1be..9c6f2b872 100644 --- a/xserver/hw/xfree86/common/Makefile.in +++ b/xserver/hw/xfree86/common/Makefile.in @@ -272,6 +272,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/ddc/Makefile.in b/xserver/hw/xfree86/ddc/Makefile.in index 274e8d245..51aa0579b 100644 --- a/xserver/hw/xfree86/ddc/Makefile.in +++ b/xserver/hw/xfree86/ddc/Makefile.in @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/dixmods/Makefile.in b/xserver/hw/xfree86/dixmods/Makefile.in index f1ac49d7c..071330bb6 100644 --- a/xserver/hw/xfree86/dixmods/Makefile.in +++ b/xserver/hw/xfree86/dixmods/Makefile.in @@ -301,6 +301,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/dixmods/extmod/Makefile.in b/xserver/hw/xfree86/dixmods/extmod/Makefile.in index 0b4dc04ce..c2bc54276 100644 --- a/xserver/hw/xfree86/dixmods/extmod/Makefile.in +++ b/xserver/hw/xfree86/dixmods/extmod/Makefile.in @@ -238,6 +238,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/Makefile.in b/xserver/hw/xfree86/doc/Makefile.in index 842f623b2..dd3c11d97 100644 --- a/xserver/hw/xfree86/doc/Makefile.in +++ b/xserver/hw/xfree86/doc/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/devel/Makefile.in b/xserver/hw/xfree86/doc/devel/Makefile.in index 0047d3857..9befdd1b0 100644 --- a/xserver/hw/xfree86/doc/devel/Makefile.in +++ b/xserver/hw/xfree86/doc/devel/Makefile.in @@ -205,6 +205,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/man/Makefile.in b/xserver/hw/xfree86/doc/man/Makefile.in index 3e4311845..8d260d87a 100644 --- a/xserver/hw/xfree86/doc/man/Makefile.in +++ b/xserver/hw/xfree86/doc/man/Makefile.in @@ -218,6 +218,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/man/Xorg.man.pre b/xserver/hw/xfree86/doc/man/Xorg.man.pre index 6c9bfcda6..027fdaeea 100644 --- a/xserver/hw/xfree86/doc/man/Xorg.man.pre +++ b/xserver/hw/xfree86/doc/man/Xorg.man.pre @@ -1,7 +1,7 @@ .\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $ .TH __xservername__ __appmansuffix__ __vendorversion__ .SH NAME -__xservername__ - X11R6 X server +__xservername__ - X11R7 X server .SH SYNOPSIS .B __xservername__ .RI [\fB:\fP display ] @@ -13,30 +13,26 @@ is a full featured X server that was originally designed for UNIX and UNIX-like operating systems running on Intel x86 hardware. It now runs on a wider range of hardware and OS platforms. .PP -This work was derived from +This work was derived by the X.Org Foundation from the XFree86 Project's .I "XFree86\ 4.4rc2" -by the X.Org Foundation. -The XFree86 4.4rc2 release was originally derived from +release. +The XFree86 release was originally derived from .I "X386\ 1.2" by Thomas Roell which was contributed to X11R5 by Snitily Graphics -Consulting Service. The -.B __xservername__ -server architecture includes -among many other things a loadable module system derived from code -donated by Metro Link, Inc. The current __xservername__ release is compatible -with X11R6.6. +Consulting Service. .SH PLATFORMS .PP .B __xservername__ operates under a wide range of operating systems and hardware platforms. The Intel x86 (IA32) architecture is the most widely supported hardware -platform. Other hardware platforms include Compaq Alpha, Intel IA64, +platform. Other hardware platforms include Compaq Alpha, Intel IA64, AMD64, SPARC and PowerPC. The most widely supported operating systems are the -free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD and -OpenBSD. Commercial UNIX operating systems such as Solaris (x86) and +free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD, +OpenBSD, and Solaris. Commercial UNIX operating systems such as UnixWare are also supported. Other supported operating systems include LynxOS, and GNU Hurd. Darwin and Mac OS X are supported with the -XDarwin(1) X server. Win32/Cygwin is supported with the XWin X server. +XDarwin(__appmansuffix__) X server. Win32/Cygwin is supported with the +XWin(__appmansuffix__) X server. .PP .SH "NETWORK CONNECTIONS" .B __xservername__ @@ -119,13 +115,14 @@ one way, the highest precedence mechanism is used. The list of mechanisms is ordered from highest precedence to lowest. Note that not all parameters can be supplied via all methods. The available command line options and environment variables (and some defaults) are described here and in -the Xserver(1) manual page. Most configuration file parameters, with -their defaults, are described in the __xconfigfile__(__filemansuffix__) manual -page. Driver and module specific configuration parameters are described -in the relevant driver or module manual page. +the Xserver(__appmansuffix__) manual page. Most configuration file +parameters, with their defaults, are described in the +__xconfigfile__(__filemansuffix__) manual page. Driver and module specific +configuration parameters are described in the relevant driver or module +manual page. .PP -In addition to the normal server options described in the Xserver(1) -manual page, +In addition to the normal server options described in the +Xserver(__appmansuffix__) manual page, .B __xservername__ accepts the following command line switches: .TP 8 @@ -393,7 +390,8 @@ options. When this option is specified, the .B __xservername__ server scans the PCI bus, and prints out some information about each -device that was detected. See also scanpci(1) and pcitweak(1). +device that was detected. See also scanpci(__appmansuffix__) +and pcitweak(__appmansuffix__). .TP 8 .BI \-screen " screen-name" Use the __xconfigfile__(__filemansuffix__) file @@ -516,13 +514,12 @@ for its initial setup. Refer to the __xconfigfile__(__filemansuffix__) manual page for information about the format of this file. .PP -Starting with version 4.4, .B __xservername__ has a mechanism for automatically generating a built-in configuration at run-time when no .B __xconfigfile__ file is present. The current version of this automatic configuration -mechanism works in three ways. +mechanism works in two ways. .PP The first is via enhancements that have made many components of the .B __xconfigfile__ @@ -531,14 +528,7 @@ reasonably deduced doesn't need to be specified explicitly, greatly reducing the amount of built-in configuration information that needs to be generated at run-time. .PP -The second is to use an external utility called getconfig(1), when -available, to use meta-configuration information to generate a suitable -configuration for the primary video device. The meta-configuration -information can be updated to allow an existing installation to get the -best out of new hardware or to work around bugs that are found -post-release. -.PP -The third is to have "safe" fallbacks for most configuration information. +The second is to have "safe" fallbacks for most configuration information. This maximises the likelihood that the .B __xservername__ server will start up in some usable configuration even when information @@ -652,7 +642,7 @@ __xservername__ was originally based on XFree86 4.4rc2. That was originally based on \fIX386 1.2\fP by Thomas Roell, which was contributed to the then X Consortium's X11R5 distribution by SGCS. .PP -__xservername__ is released by the X.org Foundation. +__xservername__ is released by the X.Org Foundation. .PP The project that became XFree86 was originally founded in 1992 by David Dawes, Glenn Lai, Jim Tsillas and David Wexelblat. @@ -693,9 +683,9 @@ Orest Zborowski \fIorestz@eskimo.com\fP .RE .PP __xservername__ source is available from the FTP server -\fI<ftp://ftp.x.org/>\fP, and from the X.org -server \fI<http://www.freedesktop.org/cvs/>\fP. Documentation and other -information can be found from the X.org web site +\fI<ftp://ftp.x.org/>\fP, and from the X.Org +server \fI<http://gitweb.freedesktop.org/>\fP. Documentation and other +information can be found from the X.Org web site \fI<http://www.x.org/>\fP. .SH LEGAL diff --git a/xserver/hw/xfree86/doc/sgml/Makefile.in b/xserver/hw/xfree86/doc/sgml/Makefile.in index a87425a8d..772e41277 100644 --- a/xserver/hw/xfree86/doc/sgml/Makefile.in +++ b/xserver/hw/xfree86/doc/sgml/Makefile.in @@ -225,6 +225,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/dri/Makefile.in b/xserver/hw/xfree86/dri/Makefile.in index 7e291ba91..454dd565d 100644 --- a/xserver/hw/xfree86/dri/Makefile.in +++ b/xserver/hw/xfree86/dri/Makefile.in @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/dummylib/Makefile.in b/xserver/hw/xfree86/dummylib/Makefile.in index b0cc5738a..c97bb2c66 100644 --- a/xserver/hw/xfree86/dummylib/Makefile.in +++ b/xserver/hw/xfree86/dummylib/Makefile.in @@ -248,6 +248,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/exa/Makefile.in b/xserver/hw/xfree86/exa/Makefile.in index c5fd3b098..0bcb2684a 100644 --- a/xserver/hw/xfree86/exa/Makefile.in +++ b/xserver/hw/xfree86/exa/Makefile.in @@ -236,6 +236,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/fbdevhw/Makefile.in b/xserver/hw/xfree86/fbdevhw/Makefile.in index adbd1f1cb..d79bc38b7 100644 --- a/xserver/hw/xfree86/fbdevhw/Makefile.in +++ b/xserver/hw/xfree86/fbdevhw/Makefile.in @@ -242,6 +242,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/i2c/Makefile.in b/xserver/hw/xfree86/i2c/Makefile.in index ab45f041e..589ae7b46 100644 --- a/xserver/hw/xfree86/i2c/Makefile.in +++ b/xserver/hw/xfree86/i2c/Makefile.in @@ -261,6 +261,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/int10/Makefile.in b/xserver/hw/xfree86/int10/Makefile.in index 416307019..a25eabeeb 100644 --- a/xserver/hw/xfree86/int10/Makefile.in +++ b/xserver/hw/xfree86/int10/Makefile.in @@ -246,6 +246,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/loader/Makefile.in b/xserver/hw/xfree86/loader/Makefile.in index 401453367..942dae301 100644 --- a/xserver/hw/xfree86/loader/Makefile.in +++ b/xserver/hw/xfree86/loader/Makefile.in @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in index 5bf6da2e4..3461823f5 100644 --- a/xserver/hw/xfree86/os-support/Makefile.in +++ b/xserver/hw/xfree86/os-support/Makefile.in @@ -238,6 +238,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in index 26fc18e53..7452b493d 100644 --- a/xserver/hw/xfree86/os-support/bsd/Makefile.in +++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in @@ -253,6 +253,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in index 2515f74b7..5ecbdb73b 100644 --- a/xserver/hw/xfree86/os-support/bus/Makefile.in +++ b/xserver/hw/xfree86/os-support/bus/Makefile.in @@ -258,6 +258,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in index 35bd66f0f..2c9013e01 100644 --- a/xserver/hw/xfree86/os-support/hurd/Makefile.in +++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in @@ -56,9 +56,9 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libhurd_la_LIBADD = am_libhurd_la_OBJECTS = hurd_init.lo hurd_mmap.lo hurd_mouse.lo \ - hurd_video.lo VTsw_noop.lo posix_tty.lo libc_wrapper.lo \ - stdResource.lo stdPci.lo sigiostubs.lo pm_noop.lo kmod_noop.lo \ - agp_noop.lo + hurd_video.lo hurd_io.lo hurd_kbd.lo VTsw_noop.lo posix_tty.lo \ + libc_wrapper.lo stdResource.lo stdPci.lo sigiostubs.lo \ + pm_noop.lo kmod_noop.lo agp_noop.lo at_scancode.lo libhurd_la_OBJECTS = $(am_libhurd_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -223,6 +223,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ @@ -537,7 +539,7 @@ xglmoduledir = @xglmoduledir@ xpconfigdir = @xpconfigdir@ noinst_LTLIBRARIES = libhurd.la libhurd_la_SOURCES = hurd_init.c hurd_mmap.c \ - hurd_mouse.c hurd_video.c \ + hurd_mouse.c hurd_video.c hurd_io.c hurd_kbd.c \ $(srcdir)/../shared/VTsw_noop.c \ $(srcdir)/../shared/posix_tty.c \ $(srcdir)/../shared/libc_wrapper.c \ @@ -546,9 +548,10 @@ libhurd_la_SOURCES = hurd_init.c hurd_mmap.c \ $(srcdir)/../shared/sigiostubs.c \ $(srcdir)/../shared/pm_noop.c \ $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/agp_noop.c + $(srcdir)/../shared/agp_noop.c \ + $(srcdir)/../shared/at_scancode.c -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) all: all-am @@ -603,7 +606,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VTsw_noop.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/agp_noop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at_scancode.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_init.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_kbd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_mmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_mouse.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hurd_video.Plo@am__quote@ @@ -699,6 +705,13 @@ agp_noop.lo: $(srcdir)/../shared/agp_noop.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o agp_noop.lo `test -f '$(srcdir)/../shared/agp_noop.c' || echo '$(srcdir)/'`$(srcdir)/../shared/agp_noop.c +at_scancode.lo: $(srcdir)/../shared/at_scancode.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT at_scancode.lo -MD -MP -MF "$(DEPDIR)/at_scancode.Tpo" -c -o at_scancode.lo `test -f '$(srcdir)/../shared/at_scancode.c' || echo '$(srcdir)/'`$(srcdir)/../shared/at_scancode.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/at_scancode.Tpo" "$(DEPDIR)/at_scancode.Plo"; else rm -f "$(DEPDIR)/at_scancode.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../shared/at_scancode.c' object='at_scancode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o at_scancode.lo `test -f '$(srcdir)/../shared/at_scancode.c' || echo '$(srcdir)/'`$(srcdir)/../shared/at_scancode.c + mostlyclean-libtool: -rm -f *.lo diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in index e646056f7..bc1e99211 100644 --- a/xserver/hw/xfree86/os-support/linux/Makefile.in +++ b/xserver/hw/xfree86/os-support/linux/Makefile.in @@ -241,6 +241,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/lynxos/Makefile.in b/xserver/hw/xfree86/os-support/lynxos/Makefile.in index 2027e5dee..3ef06a04f 100644 --- a/xserver/hw/xfree86/os-support/lynxos/Makefile.in +++ b/xserver/hw/xfree86/os-support/lynxos/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in index 1c4d4015d..acddf9c2a 100644 --- a/xserver/hw/xfree86/os-support/misc/Makefile.in +++ b/xserver/hw/xfree86/os-support/misc/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/sco/Makefile.in b/xserver/hw/xfree86/os-support/sco/Makefile.in index 9e311e40c..5aed93dd4 100644 --- a/xserver/hw/xfree86/os-support/sco/Makefile.in +++ b/xserver/hw/xfree86/os-support/sco/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in index 1886b5147..27bc5668f 100644 --- a/xserver/hw/xfree86/os-support/solaris/Makefile.in +++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in @@ -258,6 +258,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/sysv/Makefile.in b/xserver/hw/xfree86/os-support/sysv/Makefile.in index 477391479..b1df88b20 100644 --- a/xserver/hw/xfree86/os-support/sysv/Makefile.in +++ b/xserver/hw/xfree86/os-support/sysv/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/usl/Makefile.in b/xserver/hw/xfree86/os-support/usl/Makefile.in index d59d7eda1..48b324797 100644 --- a/xserver/hw/xfree86/os-support/usl/Makefile.in +++ b/xserver/hw/xfree86/os-support/usl/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/parser/Makefile.in b/xserver/hw/xfree86/parser/Makefile.in index 9826cb5cf..8f4f7d77d 100644 --- a/xserver/hw/xfree86/parser/Makefile.in +++ b/xserver/hw/xfree86/parser/Makefile.in @@ -240,6 +240,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/rac/Makefile.in b/xserver/hw/xfree86/rac/Makefile.in index f651280d7..793e5a18d 100644 --- a/xserver/hw/xfree86/rac/Makefile.in +++ b/xserver/hw/xfree86/rac/Makefile.in @@ -233,6 +233,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/ramdac/Makefile.in b/xserver/hw/xfree86/ramdac/Makefile.in index 59c384fbb..f971aaa6a 100644 --- a/xserver/hw/xfree86/ramdac/Makefile.in +++ b/xserver/hw/xfree86/ramdac/Makefile.in @@ -234,6 +234,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/scanpci/Makefile.in b/xserver/hw/xfree86/scanpci/Makefile.in index 0f2050195..0198151e1 100644 --- a/xserver/hw/xfree86/scanpci/Makefile.in +++ b/xserver/hw/xfree86/scanpci/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/shadowfb/Makefile.in b/xserver/hw/xfree86/shadowfb/Makefile.in index 33a9f46cc..080b93df2 100644 --- a/xserver/hw/xfree86/shadowfb/Makefile.in +++ b/xserver/hw/xfree86/shadowfb/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/Makefile.in b/xserver/hw/xfree86/utils/Makefile.in index f72076aa4..b8d0b8096 100644 --- a/xserver/hw/xfree86/utils/Makefile.in +++ b/xserver/hw/xfree86/utils/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/cvt/Makefile.in b/xserver/hw/xfree86/utils/cvt/Makefile.in index 96042d24c..82f194a2a 100644 --- a/xserver/hw/xfree86/utils/cvt/Makefile.in +++ b/xserver/hw/xfree86/utils/cvt/Makefile.in @@ -260,6 +260,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/gtf/Makefile.in b/xserver/hw/xfree86/utils/gtf/Makefile.in index a2c6f37e4..5c9deb7a0 100644 --- a/xserver/hw/xfree86/utils/gtf/Makefile.in +++ b/xserver/hw/xfree86/utils/gtf/Makefile.in @@ -265,6 +265,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/ioport/Makefile.in b/xserver/hw/xfree86/utils/ioport/Makefile.in index d839f964e..22e31b621 100644 --- a/xserver/hw/xfree86/utils/ioport/Makefile.in +++ b/xserver/hw/xfree86/utils/ioport/Makefile.in @@ -253,6 +253,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/kbd_mode/Makefile.in b/xserver/hw/xfree86/utils/kbd_mode/Makefile.in index 0f9e725fd..bf36eb48e 100644 --- a/xserver/hw/xfree86/utils/kbd_mode/Makefile.in +++ b/xserver/hw/xfree86/utils/kbd_mode/Makefile.in @@ -268,6 +268,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/pcitweak/Makefile.in b/xserver/hw/xfree86/utils/pcitweak/Makefile.in index f0951049c..26145e1b9 100644 --- a/xserver/hw/xfree86/utils/pcitweak/Makefile.in +++ b/xserver/hw/xfree86/utils/pcitweak/Makefile.in @@ -267,6 +267,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/scanpci/Makefile.in b/xserver/hw/xfree86/utils/scanpci/Makefile.in index 6d4d6d813..cc3c6aff5 100644 --- a/xserver/hw/xfree86/utils/scanpci/Makefile.in +++ b/xserver/hw/xfree86/utils/scanpci/Makefile.in @@ -268,6 +268,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/xorgcfg/Makefile.in b/xserver/hw/xfree86/utils/xorgcfg/Makefile.in index 4678d5109..45a5bd528 100644 --- a/xserver/hw/xfree86/utils/xorgcfg/Makefile.in +++ b/xserver/hw/xfree86/utils/xorgcfg/Makefile.in @@ -303,6 +303,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/xorgconfig/Makefile.in b/xserver/hw/xfree86/utils/xorgconfig/Makefile.in index f4fab1b4f..eb38d5dd0 100644 --- a/xserver/hw/xfree86/utils/xorgconfig/Makefile.in +++ b/xserver/hw/xfree86/utils/xorgconfig/Makefile.in @@ -268,6 +268,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/vbe/Makefile.in b/xserver/hw/xfree86/vbe/Makefile.in index 5e51b23ae..a9a4b9b64 100644 --- a/xserver/hw/xfree86/vbe/Makefile.in +++ b/xserver/hw/xfree86/vbe/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/vgahw/Makefile.in b/xserver/hw/xfree86/vgahw/Makefile.in index 277d2a200..7c36520c4 100644 --- a/xserver/hw/xfree86/vgahw/Makefile.in +++ b/xserver/hw/xfree86/vgahw/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/x86emu/Makefile.in b/xserver/hw/xfree86/x86emu/Makefile.in index 49b7aa743..e75569f96 100644 --- a/xserver/hw/xfree86/x86emu/Makefile.in +++ b/xserver/hw/xfree86/x86emu/Makefile.in @@ -224,6 +224,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/xaa/Makefile.in b/xserver/hw/xfree86/xaa/Makefile.in index 991b3cb27..64f7263f5 100644 --- a/xserver/hw/xfree86/xaa/Makefile.in +++ b/xserver/hw/xfree86/xaa/Makefile.in @@ -251,6 +251,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/xf1bpp/Makefile.in b/xserver/hw/xfree86/xf1bpp/Makefile.in index fbf9cdb49..aeca7eeca 100644 --- a/xserver/hw/xfree86/xf1bpp/Makefile.in +++ b/xserver/hw/xfree86/xf1bpp/Makefile.in @@ -243,6 +243,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/xf4bpp/Makefile.in b/xserver/hw/xfree86/xf4bpp/Makefile.in index eec33ff97..7823c757b 100644 --- a/xserver/hw/xfree86/xf4bpp/Makefile.in +++ b/xserver/hw/xfree86/xf4bpp/Makefile.in @@ -240,6 +240,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/xf8_16bpp/Makefile.in b/xserver/hw/xfree86/xf8_16bpp/Makefile.in index af5bb5f94..2f4767d85 100644 --- a/xserver/hw/xfree86/xf8_16bpp/Makefile.in +++ b/xserver/hw/xfree86/xf8_16bpp/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xfree86/xf8_32bpp/Makefile.in b/xserver/hw/xfree86/xf8_32bpp/Makefile.in index 6d4bb6994..54577f4f3 100644 --- a/xserver/hw/xfree86/xf8_32bpp/Makefile.in +++ b/xserver/hw/xfree86/xf8_32bpp/Makefile.in @@ -235,6 +235,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/Makefile.in b/xserver/hw/xgl/Makefile.in index fe240117e..422d59805 100644 --- a/xserver/hw/xgl/Makefile.in +++ b/xserver/hw/xgl/Makefile.in @@ -248,6 +248,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/egl/Makefile.in b/xserver/hw/xgl/egl/Makefile.in index a75332e09..5abaf4715 100644 --- a/xserver/hw/xgl/egl/Makefile.in +++ b/xserver/hw/xgl/egl/Makefile.in @@ -236,6 +236,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/egl/module/Makefile.in b/xserver/hw/xgl/egl/module/Makefile.in index c45237b86..092b55c4b 100644 --- a/xserver/hw/xgl/egl/module/Makefile.in +++ b/xserver/hw/xgl/egl/module/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/glx/Makefile.in b/xserver/hw/xgl/glx/Makefile.in index 680749ad6..acb6a7a4e 100644 --- a/xserver/hw/xgl/glx/Makefile.in +++ b/xserver/hw/xgl/glx/Makefile.in @@ -226,6 +226,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/glx/module/Makefile.in b/xserver/hw/xgl/glx/module/Makefile.in index e5058d24f..2e5b3a8b3 100644 --- a/xserver/hw/xgl/glx/module/Makefile.in +++ b/xserver/hw/xgl/glx/module/Makefile.in @@ -230,6 +230,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/glxext/Makefile.in b/xserver/hw/xgl/glxext/Makefile.in index 52cb8ab24..0c167ffed 100644 --- a/xserver/hw/xgl/glxext/Makefile.in +++ b/xserver/hw/xgl/glxext/Makefile.in @@ -227,6 +227,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xgl/glxext/module/Makefile.in b/xserver/hw/xgl/glxext/module/Makefile.in index fe7c66747..1d62d3daf 100644 --- a/xserver/hw/xgl/glxext/module/Makefile.in +++ b/xserver/hw/xgl/glxext/module/Makefile.in @@ -231,6 +231,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xnest/Makefile.in b/xserver/hw/xnest/Makefile.in index 2a5837703..e5bc2f2d8 100644 --- a/xserver/hw/xnest/Makefile.in +++ b/xserver/hw/xnest/Makefile.in @@ -246,6 +246,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ @@ -606,6 +608,7 @@ Xnest_LDADD = $(XORG_CORE_LIBS) \ Xnest_LDFLAGS = AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ -DNO_HW_ONLY_EXTS \ + -DXFree86Server \ $(DIX_CFLAGS) \ $(XNESTMODULES_CFLAGS) diff --git a/xserver/hw/xprint/Makefile.in b/xserver/hw/xprint/Makefile.in index d6c2d4cc1..e8aee6979 100644 --- a/xserver/hw/xprint/Makefile.in +++ b/xserver/hw/xprint/Makefile.in @@ -237,6 +237,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ @@ -553,7 +555,8 @@ SUBDIRS = doc pcl pcl-mono raster ps config Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ -DXPRINTDIR=\"$(datadir)/X11/xserver\" \ - -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX + -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX \ + -DXFree86Server Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ diff --git a/xserver/hw/xprint/config/C/Makefile.in b/xserver/hw/xprint/config/C/Makefile.in index 027462dfb..f455800e6 100644 --- a/xserver/hw/xprint/config/C/Makefile.in +++ b/xserver/hw/xprint/config/C/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/Makefile.in b/xserver/hw/xprint/config/C/print/Makefile.in index 1873bd67f..1449c3034 100644 --- a/xserver/hw/xprint/config/C/print/Makefile.in +++ b/xserver/hw/xprint/config/C/print/Makefile.in @@ -223,6 +223,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/attributes/Makefile.in b/xserver/hw/xprint/config/C/print/attributes/Makefile.in index 9df7ad6ca..3eefc2c08 100644 --- a/xserver/hw/xprint/config/C/print/attributes/Makefile.in +++ b/xserver/hw/xprint/config/C/print/attributes/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in b/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in index bb6dc512c..a7f1e0620 100644 --- a/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in +++ b/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in b/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in index 756450eb4..f92619c43 100644 --- a/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in +++ b/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in index bea65297c..9e22128f4 100644 --- a/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in index dca2981bb..a1c45b283 100644 --- a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in index af9fdda0c..6a7c8926c 100644 --- a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in b/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in index 86f37c41b..9e6ec79b7 100644 --- a/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in index 78839673d..09b8d156f 100644 --- a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in index 53b30d098..7243daa64 100644 --- a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in index fbdf410fd..6bb0f31fa 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in index 39ec5fe67..f80870660 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in index 2a174cf29..936451e8d 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in index 7f3938e75..88b3d38fa 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/Makefile.in b/xserver/hw/xprint/config/C/print/models/Makefile.in index 88f84bfc7..18b745413 100644 --- a/xserver/hw/xprint/config/C/print/models/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in b/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in index a71e3ed52..f13ece295 100644 --- a/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in @@ -216,6 +216,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in index ec830a4e8..7251222b5 100644 --- a/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in index e7ae44fbc..15b41030d 100644 --- a/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in index 7eb86b953..1b36a31d7 100644 --- a/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in @@ -216,6 +216,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in b/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in index e6918f70b..112668917 100644 --- a/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in @@ -222,6 +222,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in index 869246400..53c86ac61 100644 --- a/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/Makefile.in b/xserver/hw/xprint/config/Makefile.in index 6cc494952..d8e6c67dc 100644 --- a/xserver/hw/xprint/config/Makefile.in +++ b/xserver/hw/xprint/config/Makefile.in @@ -224,6 +224,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/en_US/Makefile.in b/xserver/hw/xprint/config/en_US/Makefile.in index 6fb06e1ca..ccaf3e660 100644 --- a/xserver/hw/xprint/config/en_US/Makefile.in +++ b/xserver/hw/xprint/config/en_US/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/en_US/print/Makefile.in b/xserver/hw/xprint/config/en_US/print/Makefile.in index 2d24cdccc..8a53929e6 100644 --- a/xserver/hw/xprint/config/en_US/print/Makefile.in +++ b/xserver/hw/xprint/config/en_US/print/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in b/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in index f75a455c3..42514c8c0 100644 --- a/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in +++ b/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/doc/Makefile.in b/xserver/hw/xprint/doc/Makefile.in index e9df40993..83101533b 100644 --- a/xserver/hw/xprint/doc/Makefile.in +++ b/xserver/hw/xprint/doc/Makefile.in @@ -217,6 +217,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/etc/Makefile.in b/xserver/hw/xprint/etc/Makefile.in index 6678a2ba2..68c9b57fd 100644 --- a/xserver/hw/xprint/etc/Makefile.in +++ b/xserver/hw/xprint/etc/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/etc/Xsession.d/Makefile.in b/xserver/hw/xprint/etc/Xsession.d/Makefile.in index 8487974bf..e39a38fca 100644 --- a/xserver/hw/xprint/etc/Xsession.d/Makefile.in +++ b/xserver/hw/xprint/etc/Xsession.d/Makefile.in @@ -213,6 +213,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/etc/init.d/Makefile.in b/xserver/hw/xprint/etc/init.d/Makefile.in index ed918c4d9..b2eae0f93 100644 --- a/xserver/hw/xprint/etc/init.d/Makefile.in +++ b/xserver/hw/xprint/etc/init.d/Makefile.in @@ -207,6 +207,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/etc/profile.d/Makefile.in b/xserver/hw/xprint/etc/profile.d/Makefile.in index 87196726c..7a040237f 100644 --- a/xserver/hw/xprint/etc/profile.d/Makefile.in +++ b/xserver/hw/xprint/etc/profile.d/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/pcl-mono/Makefile.in b/xserver/hw/xprint/pcl-mono/Makefile.in index d3d62317f..04843281e 100644 --- a/xserver/hw/xprint/pcl-mono/Makefile.in +++ b/xserver/hw/xprint/pcl-mono/Makefile.in @@ -224,6 +224,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/pcl/Makefile.in b/xserver/hw/xprint/pcl/Makefile.in index 2f858b24c..489d523d9 100644 --- a/xserver/hw/xprint/pcl/Makefile.in +++ b/xserver/hw/xprint/pcl/Makefile.in @@ -224,6 +224,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/ps/Makefile.in b/xserver/hw/xprint/ps/Makefile.in index fd65ba522..853dadd31 100644 --- a/xserver/hw/xprint/ps/Makefile.in +++ b/xserver/hw/xprint/ps/Makefile.in @@ -235,6 +235,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xprint/raster/Makefile.in b/xserver/hw/xprint/raster/Makefile.in index 401cf0781..4f94a96ec 100644 --- a/xserver/hw/xprint/raster/Makefile.in +++ b/xserver/hw/xprint/raster/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/hw/xwin/Makefile.in b/xserver/hw/xwin/Makefile.in index 59f167078..f0cb9d655 100644 --- a/xserver/hw/xwin/Makefile.in +++ b/xserver/hw/xwin/Makefile.in @@ -311,6 +311,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in index e52500bb4..580b5fd57 100644 --- a/xserver/include/Makefile.in +++ b/xserver/include/Makefile.in @@ -223,6 +223,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/include/dix-config.h.in b/xserver/include/dix-config.h.in index e12329062..41a0a4976 100644 --- a/xserver/include/dix-config.h.in +++ b/xserver/include/dix-config.h.in @@ -410,16 +410,8 @@ /* Endian order */ #undef X_BYTE_ORDER -/* BSD-compliant source */ -#undef _BSD_SOURCE - -/* POSIX-compliant source */ -#undef _POSIX_SOURCE - -#ifndef _XOPEN_SOURCE -/* X/Open-compliant source */ -#undef _XOPEN_SOURCE -#endif +/* Enable GNU and other extensions to the C environment for GLIBC */ +#undef _GNU_SOURCE /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/xserver/include/do-not-use-config.h.in b/xserver/include/do-not-use-config.h.in index 7ea610dce..a0dd8d507 100644 --- a/xserver/include/do-not-use-config.h.in +++ b/xserver/include/do-not-use-config.h.in @@ -633,14 +633,8 @@ `char[]'. */ #undef YYTEXT_POINTER -/* BSD-compliant source */ -#undef _BSD_SOURCE - -/* POSIX-compliant source */ -#undef _POSIX_SOURCE - -/* X/Open-compliant source */ -#undef _XOPEN_SOURCE +/* Enable GNU and other extensions to the C environment for glibc */ +#undef _GNU_SOURCE /* Define to 1 if unsigned long is 64 bits. */ #undef _XSERVER64 diff --git a/xserver/mfb/Makefile.in b/xserver/mfb/Makefile.in index 2fdb16864..8cd66f717 100644 --- a/xserver/mfb/Makefile.in +++ b/xserver/mfb/Makefile.in @@ -242,6 +242,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/mi/Makefile.in b/xserver/mi/Makefile.in index 72d966033..ab744fd8c 100644 --- a/xserver/mi/Makefile.in +++ b/xserver/mi/Makefile.in @@ -253,6 +253,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/miext/Makefile.in b/xserver/miext/Makefile.in index d024502d6..b1d42cdcb 100644 --- a/xserver/miext/Makefile.in +++ b/xserver/miext/Makefile.in @@ -211,6 +211,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/miext/cw/Makefile.in b/xserver/miext/cw/Makefile.in index 0ab27b38c..049885f3d 100644 --- a/xserver/miext/cw/Makefile.in +++ b/xserver/miext/cw/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/miext/damage/Makefile.in b/xserver/miext/damage/Makefile.in index 60f5f3913..76b071444 100644 --- a/xserver/miext/damage/Makefile.in +++ b/xserver/miext/damage/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/miext/rootless/Makefile.in b/xserver/miext/rootless/Makefile.in index 1f2dc6e79..56d911265 100644 --- a/xserver/miext/rootless/Makefile.in +++ b/xserver/miext/rootless/Makefile.in @@ -202,6 +202,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/miext/shadow/Makefile.in b/xserver/miext/shadow/Makefile.in index d83bb41a3..d39c0fa54 100644 --- a/xserver/miext/shadow/Makefile.in +++ b/xserver/miext/shadow/Makefile.in @@ -237,6 +237,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/os/Makefile.in b/xserver/os/Makefile.in index 27c3bf164..5fc04b324 100644 --- a/xserver/os/Makefile.in +++ b/xserver/os/Makefile.in @@ -243,6 +243,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/randr/Makefile.in b/xserver/randr/Makefile.in index a38a77b52..d29d9b701 100644 --- a/xserver/randr/Makefile.in +++ b/xserver/randr/Makefile.in @@ -232,6 +232,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/record/Makefile.in b/xserver/record/Makefile.in index a1b662c0c..5c910b202 100644 --- a/xserver/record/Makefile.in +++ b/xserver/record/Makefile.in @@ -220,6 +220,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/render/Makefile.in b/xserver/render/Makefile.in index 00fb09231..659a08ca1 100644 --- a/xserver/render/Makefile.in +++ b/xserver/render/Makefile.in @@ -235,6 +235,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/xfixes/Makefile.in b/xserver/xfixes/Makefile.in index 890d18e19..8e0c48b82 100644 --- a/xserver/xfixes/Makefile.in +++ b/xserver/xfixes/Makefile.in @@ -221,6 +221,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ diff --git a/xserver/xkb/Makefile.in b/xserver/xkb/Makefile.in index e82bf9fb3..1b5644850 100644 --- a/xserver/xkb/Makefile.in +++ b/xserver/xkb/Makefile.in @@ -244,6 +244,8 @@ INT10_X86EMU_FALSE = @INT10_X86EMU_FALSE@ INT10_X86EMU_TRUE = @INT10_X86EMU_TRUE@ KDRIVEFBDEV_FALSE = @KDRIVEFBDEV_FALSE@ KDRIVEFBDEV_TRUE = @KDRIVEFBDEV_TRUE@ +KDRIVELINUX_FALSE = @KDRIVELINUX_FALSE@ +KDRIVELINUX_TRUE = @KDRIVELINUX_TRUE@ KDRIVEVESA_FALSE = @KDRIVEVESA_FALSE@ KDRIVEVESA_TRUE = @KDRIVEVESA_TRUE@ KDRIVE_CFLAGS = @KDRIVE_CFLAGS@ |