svn merge ^/branches/released

1 files changed, 450 insertions, 123 deletions

diff --git a/xorg-server/configure b/xorg-server/configure
index c69ed80d6..30c44d599 100644
--- a/xorg-server/configure
+++ b/xorg-server/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for xorg-server 1.7.99.2.
+# Generated by GNU Autoconf 2.65 for xorg-server 1.7.99.901.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -702,8 +702,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.7.99.2'
-PACKAGE_STRING='xorg-server 1.7.99.2'
+PACKAGE_VERSION='1.7.99.901'
+PACKAGE_STRING='xorg-server 1.7.99.901'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -762,6 +762,12 @@ KDRIVEFBDEV_FALSE
 KDRIVEFBDEV_TRUE
 TSLIB_FALSE
 TSLIB_TRUE
+KDRIVE_MOUSE_FALSE
+KDRIVE_MOUSE_TRUE
+KDRIVE_KBD_FALSE
+KDRIVE_KBD_TRUE
+KDRIVE_EVDEV_FALSE
+KDRIVE_EVDEV_TRUE
 KDRIVELINUX_FALSE
 KDRIVELINUX_TRUE
 KDRIVE_LIBS
@@ -781,9 +787,6 @@ DMX_BUILD_USB_FALSE
 DMX_BUILD_USB_TRUE
 DMX_BUILD_LNX_FALSE
 DMX_BUILD_LNX_TRUE
-HAVE_DOXYGEN_FALSE
-HAVE_DOXYGEN_TRUE
-DOXYGEN
 X11EXAMPLES_DEP_LIBS
 X11EXAMPLES_DEP_CFLAGS
 XRESEXAMPLES_DEP_LIBS
@@ -845,6 +848,7 @@ XWIN_LIBS
 XWINMODULES_LIBS
 XWINMODULES_CFLAGS
 WINDRES
+SYSCONFDIR
 XF86VIDMODE_FALSE
 XF86VIDMODE_TRUE
 DGA_FALSE
@@ -879,6 +883,7 @@ moduledir
 DEFAULT_LOGPREFIX
 DEFAULT_LIBRARY_PATH
 DEFAULT_MODULE_PATH
+__XCONFIGDIR__
 XF86CONFIGFILE
 __XCONFIGFILE__
 XORG_CFLAGS
@@ -1025,6 +1030,10 @@ HAVE_DBUS_FALSE
 HAVE_DBUS_TRUE
 DBUS_LIBS
 DBUS_CFLAGS
+CONFIG_UDEV_FALSE
+CONFIG_UDEV_TRUE
+UDEV_LIBS
+UDEV_CFLAGS
 INSTALL_LIBXF86CONFIG_FALSE
 INSTALL_LIBXF86CONFIG_TRUE
 MAKE_HTML
@@ -1128,6 +1137,9 @@ am__fastdepCCAS_TRUE
 CCASDEPMODE
 CCASFLAGS
 CCAS
+HAVE_DOXYGEN_FALSE
+HAVE_DOXYGEN_TRUE
+DOXYGEN
 ADMIN_MAN_DIR
 DRIVER_MAN_DIR
 MISC_MAN_DIR
@@ -1245,6 +1257,7 @@ enable_dependency_tracking
 enable_silent_rules
 enable_strict_compilation
 with_release_version
+with_doxygen
 enable_static
 enable_shared
 with_pic
@@ -1289,7 +1302,6 @@ with_launchd_id_prefix
 enable_sparkle
 enable_builddocs
 enable_install_libxf86config
-enable_null_root_cursor
 enable_visibility
 enable_pc98
 with_dri_driver_path
@@ -1320,6 +1332,7 @@ enable_multibuffer
 enable_dbe
 enable_xf86bigfont
 enable_dpms
+enable_config_udev
 enable_config_dbus
 enable_config_hal
 enable_xfree86_utils
@@ -1338,6 +1351,9 @@ enable_kdrive
 enable_xephyr
 enable_xfake
 enable_xfbdev
+enable_kdrive_kbd
+enable_kdrive_mouse
+enable_kdrive_evdev
 enable_install_setuid
 enable_unix_transport
 enable_tcp_transport
@@ -1357,10 +1373,13 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+DOXYGEN
 CCAS
 CCASFLAGS
 YACC
 YFLAGS
+UDEV_CFLAGS
+UDEV_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
 HAL_CFLAGS
@@ -1962,7 +1981,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.7.99.2 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.7.99.901 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2032,7 +2051,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorg-server 1.7.99.2:";;
+     short | recursive ) echo "Configuration of xorg-server 1.7.99.901:";;
    esac
   cat <<\_ACEOF
 
@@ -2066,8 +2085,6 @@ Optional Features:
   --enable-builddocs      Build docs (default: disabled)
   --enable-install-libxf86config
                           Install libxf86config (default: disabled)
-  --enable-null-root-cursor
-                          Use an empty root cursor (default: use core cursor)
   --enable-visibility     Enable symbol visibility (default: auto)
   --enable-pc98           Enable PC98 support in Xorg (default: auto)
   --enable-aiglx          Build accelerated indirect GLX (default: enabled)
@@ -2098,6 +2115,7 @@ Optional Features:
   --disable-dbe           Build DBE extension (default: enabled)
   --disable-xf86bigfont   Build XF86 Big Font extension (default: disabled)
   --disable-dpms          Build DPMS extension (default: enabled)
+  --enable-config-udev    Build udev support (default: no)
   --enable-config-dbus    Build D-BUS API support (default: no)
   --disable-config-hal    Build HAL support (default: auto)
   --enable-xfree86-utils  Build xfree86 DDX utilities (default: enabled)
@@ -2120,6 +2138,9 @@ Optional Features:
   --enable-xfake          Build the kdrive 'fake' server (default: auto)
   --enable-xfbdev         Build the kdrive framebuffer device server (default:
                           auto)
+  --enable-kdrive-kbd     Build kbd driver for kdrive (default: auto)
+  --enable-kdrive-mouse   Build mouse driver for kdrive (default: auto)
+  --enable-kdrive-evdev   Build evdev driver for kdrive (default: auto)
   --enable-install-setuid Install Xorg server as owned by root with setuid bit
                           (default: auto)
   --enable-unix-transport Enable UNIX domain socket transport
@@ -2134,6 +2155,8 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-release-version=STRING
                           Use release version string in package name
+  --with-doxygen          Use doxygen to regenerate documentation (default:
+                          yes, if installed)
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -2209,6 +2232,7 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  DOXYGEN     Path to doxygen command
   CCAS        assembler compiler command (defaults to CC)
   CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
@@ -2216,6 +2240,8 @@ Some influential environment variables:
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
+  UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
+  UDEV_LIBS   linker flags for UDEV, overriding pkg-config
   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
   HAL_CFLAGS  C compiler flags for HAL, overriding pkg-config
@@ -2385,7 +2411,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.7.99.2
+xorg-server configure 1.7.99.901
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -3084,7 +3110,7 @@ cat >config.log <<_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.7.99.2, which was
+It was created by xorg-server $as_me 1.7.99.901, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3431,7 +3457,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2009-12-18"
+RELEASE_DATE="2010-02-12"
 
 am__api_version='1.11'
 
@@ -3894,7 +3920,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.7.99.2'
+ VERSION='1.7.99.901'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5837,11 +5863,11 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)"
 
 
 
-macros_docdir=$($PKG_CONFIG --print-errors --variable=docdir xorg-macros)
-INSTALL_CMD="(cp -f "$macros_docdir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
+macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
+INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
 || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
-echo 'util-macros \"docdir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
 
 
 
@@ -5919,6 +5945,128 @@ fi
 
 
 
+# Check whether --with-doxygen was given.
+if test "${with_doxygen+set}" = set; then :
+  withval=$with_doxygen; use_doxygen=$withval
+else
+  use_doxygen=auto
+fi
+
+
+if test "x$use_doxygen" = x"auto"; then
+   # Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DOXYGEN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$DOXYGEN" = "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - documentation targets will be skipped" >&5
+$as_echo "$as_me: WARNING: doxygen not found - documentation targets will be skipped" >&2;}
+	have_doxygen=no
+   else
+        have_doxygen=yes
+   fi
+elif test "x$use_doxygen" = x"yes" ; then
+   # Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DOXYGEN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$DOXYGEN" = "x"; then
+        as_fn_error "--with-doxygen=yes specified but doxygen not found in PATH" "$LINENO" 5
+   fi
+   have_doxygen=yes
+elif test "x$use_doxygen" = x"no" ; then
+   if test "x$DOXYGEN" != "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&2;}
+   fi
+   have_doxygen=no
+else
+   as_fn_error "--with-doxygen expects 'yes' or 'no'" "$LINENO" 5
+fi
+ if test "$have_doxygen" = yes; then
+  HAVE_DOXYGEN_TRUE=
+  HAVE_DOXYGEN_FALSE='#'
+else
+  HAVE_DOXYGEN_TRUE='#'
+  HAVE_DOXYGEN_FALSE=
+fi
+
+
+
+
+
 
 
 
@@ -7570,13 +7718,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7573: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7721: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7576: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7724: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7579: output\"" >&5)
+  (eval echo "\"\$as_me:7727: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8767,7 +8915,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8770 "configure"' > conftest.$ac_ext
+  echo '#line 8918 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9997,11 +10145,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10000: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10148: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10004: \$? = $ac_status" >&5
+   echo "$as_me:10152: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10336,11 +10484,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10339: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10487: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10343: \$? = $ac_status" >&5
+   echo "$as_me:10491: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10441,11 +10589,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10444: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10592: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10448: \$? = $ac_status" >&5
+   echo "$as_me:10596: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10496,11 +10644,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10499: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10647: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10503: \$? = $ac_status" >&5
+   echo "$as_me:10651: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12880,7 +13028,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12883 "configure"
+#line 13031 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12976,7 +13124,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12979 "configure"
+#line 13127 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14470,7 +14618,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h
+for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h fnmatch.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -15877,6 +16025,9 @@ fi
 $as_echo "#define CSRG_BASED 1" >>confdefs.h
 
 	;;
+  cygwin*)
+	CFLAGS="$CFLAGS -DFD_SETSIZE=256"
+	;;
 esac
 
 PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
@@ -16119,7 +16270,9 @@ fi
 $as_echo "${FONT100DPIDIR}" >&6; }
 
 
-as_ac_File=`$as_echo "ac_cv_file_${sysconfdir}/X11/fontpath.d" | $as_tr_sh`
+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+if test "$cross_compiling" != yes; then
+	as_ac_File=`$as_echo "ac_cv_file_${sysconfdir}/X11/fontpath.d" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sysconfdir}/X11/fontpath.d" >&5
 $as_echo_n "checking for ${sysconfdir}/X11/fontpath.d... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -16140,14 +16293,12 @@ eval as_val=\$$as_ac_File
    if test "x$as_val" = x""yes; then :
   DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'
 else
-
-		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-		case $host_os in
-			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+  case $host_os in
+			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
 		esac
-
 fi
 
+fi
 
 # Check whether --with-default-font-path was given.
 if test "${with_default_font_path+set}" = set; then :
@@ -16157,6 +16308,11 @@ else
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default font path" >&5
+$as_echo_n "checking for default font path... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTPATH" >&5
+$as_echo "$FONTPATH" >&6; }
+
 
 # Check whether --with-xkb-path was given.
 if test "${with_xkb_path+set}" = set; then :
@@ -16275,13 +16431,6 @@ else
   INSTALL_LIBXF86CONFIG=no
 fi
 
-# Check whether --enable-null-root-cursor was given.
-if test "${enable_null_root_cursor+set}" = set; then :
-  enableval=$enable_null_root_cursor; NULL_ROOT_CURSOR=$enableval
-else
-  NULL_ROOT_CURSOR=no
-fi
-
 # Check whether --enable-visibility was given.
 if test "${enable_visibility+set}" = set; then :
   enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval
@@ -16493,6 +16642,13 @@ else
   DPMSExtension=yes
 fi
 
+# Check whether --enable-config-udev was given.
+if test "${enable_config_udev+set}" = set; then :
+  enableval=$enable_config_udev; CONFIG_UDEV=$enableval
+else
+  CONFIG_UDEV=no
+fi
+
 # Check whether --enable-config-dbus was given.
 if test "${enable_config_dbus+set}" = set; then :
   enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval
@@ -16620,6 +16776,27 @@ else
   XFBDEV=auto
 fi
 
+# Check whether --enable-kdrive-kbd was given.
+if test "${enable_kdrive_kbd+set}" = set; then :
+  enableval=$enable_kdrive_kbd; KDRIVE_KBD=$enableval
+else
+  KDRIVE_KBD=auto
+fi
+
+# Check whether --enable-kdrive-mouse was given.
+if test "${enable_kdrive_mouse+set}" = set; then :
+  enableval=$enable_kdrive_mouse; KDRIVE_MOUSE=$enableval
+else
+  KDRIVE_MOUSE=auto
+fi
+
+# Check whether --enable-kdrive-evdev was given.
+if test "${enable_kdrive_evdev+set}" = set; then :
+  enableval=$enable_kdrive_evdev; KDRIVE_EVDEV=$enableval
+else
+  KDRIVE_EVDEV=auto
+fi
+
 
 
 # Check whether --enable-install-setuid was given.
@@ -17359,12 +17536,12 @@ RECORDPROTO="recordproto >= 1.13.99.1"
 SCRNSAVERPROTO="scrnsaverproto >= 1.1"
 RESOURCEPROTO="resourceproto"
 DRIPROTO="xf86driproto >= 2.1.0"
-DRI2PROTO="dri2proto >= 2.1"
+DRI2PROTO="dri2proto >= 2.2"
 XINERAMAPROTO="xineramaproto"
 BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
 XCALIBRATEPROTO="xcalibrateproto"
 DGAPROTO="xf86dgaproto >= 2.0.99.1"
-GLPROTO="glproto >= 1.4.9"
+GLPROTO="glproto >= 1.4.10"
 DMXPROTO="dmxproto >= 2.2.99.1"
 VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
 WINDOWSWMPROTO="windowswmproto"
@@ -17375,7 +17552,7 @@ REQUIRED_LIBS="xfont xau pixman-1 >= 0.15.20"
 
 LIBAPPLEWM="applewm >= 1.4"
 LIBDMX="dmx >= 1.0.99.1"
-LIBDRI="dri >= 7.1.0"
+LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.0"
 LIBGL="gl >= 7.1.0"
 LIBXEXT="xext >= 1.0.99.4"
@@ -17383,6 +17560,105 @@ LIBXI="xi >= 1.2.99.1"
 LIBXTST="xtst >= 1.0.99.2"
 LIBPCIACCESS="pciaccess >= 0.8.0"
 LIBGLIB="glib-2.0 >= 2.16"
+LIBUDEV="libudev >= 143"
+
+if test "x$CONFIG_UDEV" = xyes &&
+ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
+	as_fn_error "Hotplugging through both libudev and dbus/hal not allowed" "$LINENO" 5
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
+$as_echo_n "checking for UDEV... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$UDEV_CFLAGS"; then
+        pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "$LIBUDEV" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$UDEV_LIBS"; then
+        pkg_cv_UDEV_LIBS="$UDEV_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "$LIBUDEV" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBUDEV"`
+        else
+	        UDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBUDEV"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$UDEV_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                HAVE_LIBUDEV=no
+elif test $pkg_failed = untried; then
+	HAVE_LIBUDEV=no
+else
+	UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
+	UDEV_LIBS=$pkg_cv_UDEV_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LIBUDEV=yes
+fi
+if test "x$CONFIG_UDEV" = xauto; then
+	CONFIG_UDEV="$HAVE_LIBUDEV"
+fi
+ if test "x$CONFIG_UDEV" = xyes; then
+  CONFIG_UDEV_TRUE=
+  CONFIG_UDEV_FALSE='#'
+else
+  CONFIG_UDEV_TRUE='#'
+  CONFIG_UDEV_FALSE=
+fi
+
+if test "x$CONFIG_UDEV" = xyes; then
+	CONFIG_DBUS_API=no
+	CONFIG_HAL=no
+	if ! test "x$HAVE_LIBUDEV" = xyes; then
+		as_fn_error "udev configuration API requested, but libudev is not installed" "$LINENO" 5
+	fi
+
+$as_echo "#define CONFIG_UDEV 1" >>confdefs.h
+
+fi
 
 
 pkg_failed=no
@@ -17573,7 +17849,6 @@ if test "x$CONFIG_HAL" = xyes; then
 
 $as_echo "#define CONFIG_HAL 1" >>confdefs.h
 
-        REQUIRED_LIBS="$REQUIRED_LIBS hal"
 	CONFIG_NEED_DBUS="yes"
 fi
  if test "x$CONFIG_HAL" = xyes; then
@@ -17586,7 +17861,6 @@ fi
 
 
 if test "x$CONFIG_NEED_DBUS" = xyes; then
-	REQUIRED_LIBS="$REQUIRED_LIBS dbus-1"
 
 $as_echo "#define CONFIG_NEED_DBUS 1" >>confdefs.h
 
@@ -19011,12 +19285,6 @@ $as_echo "#define NEED_STRCASESTR 1" >>confdefs.h
 fi
 
 
-if test "x$NULL_ROOT_CURSOR" = xyes; then
-
-$as_echo "#define NULL_ROOT_CURSOR 1" >>confdefs.h
-
-fi
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMCP" >&5
@@ -21117,6 +21385,7 @@ fi
 
 
 		XF86CONFIGFILE="xorg.conf"
+	XF86CONFIGDIR="xorg.conf.d"
 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
 	LOGPREFIX="$logdir/Xorg."
 
@@ -21184,6 +21453,23 @@ _ACEOF
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+  eval ac_define_dir="\"$XF86CONFIGDIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  __XCONFIGDIR__="$ac_define_dir"
+
+
+cat >>confdefs.h <<_ACEOF
+#define __XCONFIGDIR__ "$ac_define_dir"
+_ACEOF
+
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+
+
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$moduledir\""
   eval ac_define_dir="\"$ac_define_dir\""
   DEFAULT_MODULE_PATH="$ac_define_dir"
@@ -21380,10 +21666,32 @@ else
   WINDOWSWM=no
 fi
 
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+  eval ac_define_dir="\"$sysconfdir\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  SYSCONFDIR="$ac_define_dir"
+
+
+cat >>confdefs.h <<_ACEOF
+#define SYSCONFDIR "$ac_define_dir"
+_ACEOF
+
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+
+
 cat >>confdefs.h <<_ACEOF
 #define XORG_VERSION_CURRENT $VENDOR_RELEASE
 _ACEOF
 
+
+cat >>confdefs.h <<_ACEOF
+#define __VENDORDWEBSUPPORT__ "$VENDOR_WEB"
+_ACEOF
+
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
@@ -21579,8 +21887,6 @@ $as_echo "#define ROOTLESS 1" >>confdefs.h
 
 			       CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND"
 			fi
-
-			CFLAGS="$CFLAGS -DFD_SETSIZE=256"
 			;;
 		mingw*)
 			XWIN_SERVER_NAME=Xming
@@ -22266,8 +22572,6 @@ else
 fi
 
 
-DOXYGEN="not_found"
-
 if test "x$DMX" = xyes; then
 	if test "x$have_dmx" = xno; then
 		as_fn_error "Xdmx build explicitly requested, but required
@@ -22847,60 +23151,6 @@ fi
 
 
 fi
-# Extract the first word of "doxygen", so it can be a program name with args.
-set dummy doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DOXYGEN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DOXYGEN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="not_found"
-  ;;
-esac
-fi
-DOXYGEN=$ac_cv_path_DOXYGEN
-if test -n "$DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "x$DOXYGEN" = "xnot_found" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&5
-$as_echo "$as_me: WARNING: doxygen not found in $PATH. Cannot build dmx documentation" >&2;}
-fi
-
- if test "x$DOXYGEN" != "xnot_found"; then
-  HAVE_DOXYGEN_TRUE=
-  HAVE_DOXYGEN_FALSE='#'
-else
-  HAVE_DOXYGEN_TRUE='#'
-  HAVE_DOXYGEN_FALSE=
-fi
-
  if test "x$DMX_BUILD_LNX" = xyes; then
   DMX_BUILD_LNX_TRUE=
   DMX_BUILD_LNX_FALSE='#'
@@ -22930,6 +23180,7 @@ else
   KDRIVE_FALSE=
 fi
 
+
 if test "$KDRIVE" = yes; then
 
 $as_echo "#define KDRIVESERVER 1" >>confdefs.h
@@ -23090,6 +23341,22 @@ $as_echo "#define TSLIB 1" >>confdefs.h
         fi
     fi
 
+    if test "x$KDRIVE_KBD" = xyes; then
+
+$as_echo "#define KDRIVE_KBD 1" >>confdefs.h
+
+    fi
+    if test "x$KDRIVE_EVDEV" = xyes; then
+
+$as_echo "#define KDRIVE_EVDEV 1" >>confdefs.h
+
+    fi
+    if test "x$KDRIVE_MOUSE" = xyes; then
+
+$as_echo "#define KDRIVE_MOUSE 1" >>confdefs.h
+
+    fi
+
     XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xfont xau xdmcp"
     if test "x$XV" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
@@ -23235,6 +23502,26 @@ fi
 	*linux*)
 	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
             KDRIVELINUX=yes
+	    if test "x$KDRIVE_EVDEV" = xauto; then
+		KDRIVE_EVDEV=yes
+	    fi
+	    if test "x$KDRIVE_KBD" = xauto; then
+		KDRIVE_KBD=yes
+	    fi
+	    if test "x$KDRIVE_MOUSE" = xauto; then
+		KDRIVE_MOUSE=yes
+	    fi
+	    ;;
+	*)
+	    if test "x$KDRIVE_EVDEV" = xauto; then
+		KDRIVE_EVDEV=no
+	    fi
+	    if test "x$KDRIVE_KBD" = xauto; then
+		KDRIVE_KBD=no
+	    fi
+	    if test "x$KDRIVE_MOUSE" = xauto; then
+		KDRIVE_MOUSE=no
+	    fi
 	    ;;
     esac
     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
@@ -23260,6 +23547,30 @@ else
   KDRIVELINUX_FALSE=
 fi
 
+ if test "x$KDRIVE_EVDEV" = xyes; then
+  KDRIVE_EVDEV_TRUE=
+  KDRIVE_EVDEV_FALSE='#'
+else
+  KDRIVE_EVDEV_TRUE='#'
+  KDRIVE_EVDEV_FALSE=
+fi
+
+ if test "x$KDRIVE_KBD" = xyes; then
+  KDRIVE_KBD_TRUE=
+  KDRIVE_KBD_FALSE='#'
+else
+  KDRIVE_KBD_TRUE='#'
+  KDRIVE_KBD_FALSE=
+fi
+
+ if test "x$KDRIVE_MOUSE" = xyes; then
+  KDRIVE_MOUSE_TRUE=
+  KDRIVE_MOUSE_FALSE='#'
+else
+  KDRIVE_MOUSE_TRUE='#'
+  KDRIVE_MOUSE_FALSE=
+fi
+
  if test "x$HAVE_TSLIB" = xyes; then
   TSLIB_TRUE=
   TSLIB_FALSE='#'
@@ -23343,9 +23654,9 @@ _ACEOF
   test "$exec_prefix_NONE" && exec_prefix=NONE
 
 
-BUILD_DATE="$(date +'%Y%m%d')"
+BUILD_DATE="`date +'%Y%m%d'`"
 
-BUILD_TIME="$(date +'1%H%M%S')"
+BUILD_TIME="`date +'1%H%M%S'`"
 
 
 DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
@@ -23475,6 +23786,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
+  as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23580,6 +23895,10 @@ if test -z "${INSTALL_LIBXF86CONFIG_TRUE}" && test -z "${INSTALL_LIBXF86CONFIG_F
   as_fn_error "conditional \"INSTALL_LIBXF86CONFIG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_UDEV_TRUE}" && test -z "${CONFIG_UDEV_FALSE}"; then
+  as_fn_error "conditional \"CONFIG_UDEV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
   as_fn_error "conditional \"HAVE_DBUS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23828,10 +24147,6 @@ if test -z "${DMX_TRUE}" && test -z "${DMX_FALSE}"; then
   as_fn_error "conditional \"DMX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
-  as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DMX_BUILD_LNX_TRUE}" && test -z "${DMX_BUILD_LNX_FALSE}"; then
   as_fn_error "conditional \"DMX_BUILD_LNX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23848,6 +24163,18 @@ if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then
   as_fn_error "conditional \"KDRIVELINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${KDRIVE_EVDEV_TRUE}" && test -z "${KDRIVE_EVDEV_FALSE}"; then
+  as_fn_error "conditional \"KDRIVE_EVDEV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${KDRIVE_KBD_TRUE}" && test -z "${KDRIVE_KBD_FALSE}"; then
+  as_fn_error "conditional \"KDRIVE_KBD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${KDRIVE_MOUSE_TRUE}" && test -z "${KDRIVE_MOUSE_FALSE}"; then
+  as_fn_error "conditional \"KDRIVE_MOUSE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then
   as_fn_error "conditional \"TSLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24276,7 +24603,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 1.7.99.2, which was
+This file was extended by xorg-server $as_me 1.7.99.901, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24342,7 +24669,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xorg-server config.status 1.7.99.2
+xorg-server config.status 1.7.99.901
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"