diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index a92db408ba..ad25ebc63c 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -30,6 +30,7 @@ $SCRIPTS/build libfontenc $SCRIPTS/build pixman $SCRIPTS/build fontsproto $SCRIPTS/build xf86bigfontproto +#$SCRIPTS/build udev $SCRIPTS/build dbus $SCRIPTS/build hal @@ -49,7 +50,6 @@ cd $PKG_BUILD --datarootdir=/usr/share \ --disable-static \ --enable-shared \ - --enable-shave \ --disable-strict-compilation \ --disable-debug \ --disable-builddocs \ @@ -82,6 +82,7 @@ cd $PKG_BUILD --enable-dbe \ --disable-xf86bigfont \ --disable-dpms \ + --disable-config-udev \ --enable-config-dbus \ --enable-config-hal \ --enable-xfree86-utils \ @@ -94,7 +95,6 @@ cd $PKG_BUILD --disable-xwin \ --disable-kdrive \ --disable-xephyr \ - --disable-xsdl \ --disable-xfake \ --enable-xfbdev \ --disable-install-setuid \ diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 0bdc9d5203..c6c948fe38 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -10,6 +10,7 @@ $SCRIPTS/install libXv $SCRIPTS/install $LIBDRM $SCRIPTS/install $MESA $SCRIPTS/install pixman +#$SCRIPTS/install udev $SCRIPTS/install dbus $SCRIPTS/install hal diff --git a/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.1-add_udev_support-0.2.diff b/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.1-add_udev_support-0.2.diff new file mode 100644 index 0000000000..6945fc5c83 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/02-xorg-server-1.7.99.1-add_udev_support-0.2.diff @@ -0,0 +1,8800 @@ +diff -Naur xorg-server-1.7.99.1/aclocal.m4 xorg-server-1.7.99.1.patch/aclocal.m4 +--- xorg-server-1.7.99.1/aclocal.m4 2009-10-21 18:07:05.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/aclocal.m4 2009-11-15 21:03:44.663231150 +0100 +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +-[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, ++[m4_warning([this file was generated for autoconf 2.63. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -87,16 +87,14 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -140,9 +138,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +@@ -177,1749 +175,1748 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) +- +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) +- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +- +-# Figure out how to run the assembler. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 5 +- +-# AM_PROG_AS +-# ---------- +-AC_DEFUN([AM_PROG_AS], +-[# By default we simply use the C compiler to build assembly code. +-AC_REQUIRE([AC_PROG_CC]) +-test "${CCAS+set}" = set || CCAS=$CC +-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +-AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) +-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) +-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl +-]) +- +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- +- +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. ++dnl ++dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. ++dnl ++dnl Permission is hereby granted, free of charge, to any person obtaining a ++dnl copy of this software and associated documentation files (the ++dnl "Software"), to deal in the Software without restriction, including ++dnl without limitation the rights to use, copy, modify, merge, publish, ++dnl distribute, and/or sell copies of the Software, and to permit persons ++dnl to whom the Software is furnished to do so, provided that the above ++dnl copyright notice(s) and this permission notice appear in all copies of ++dnl the Software and that both the above copyright notice(s) and this ++dnl permission notice appear in supporting documentation. ++dnl ++dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT ++dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ++dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL ++dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING ++dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, ++dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ++dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++dnl ++dnl Except as contained in this notice, the name of a copyright holder ++dnl shall not be used in advertising or otherwise to promote the sale, use ++dnl or other dealings in this Software without prior written authorization ++dnl of the copyright holder. + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# XORG_MACROS_VERSION(required-version) ++# ------------------------------------- ++# Minimum version: 1.1.0 + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# If you're using a macro added in Version 1.1 or newer, include this in ++# your configure.ac with the minimum required version, such as: ++# XORG_MACROS_VERSION(1.1) + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# To ensure that this macro is defined, also add: ++# m4_ifndef([XORG_MACROS_VERSION], ++# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])]) + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- ++# See the "minimum version" comment for each macro you use to see what ++# version you require. ++m4_defun([XORG_MACROS_VERSION],[ ++m4_define([vers_have], [1.3.0]) ++m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) ++m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) ++m4_if(m4_cmp(maj_have, maj_needed), 0,, ++ [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])]) ++m4_if(m4_version_compare(vers_have, [$1]), -1, ++ [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])]) ++m4_undefine([vers_have]) ++m4_undefine([maj_have]) ++m4_undefine([maj_needed]) ++]) # XORG_MACROS_VERSION + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +-# Free Software Foundation, Inc. ++# XORG_PROG_RAWCPP() ++# ------------------ ++# Minimum version: 1.0.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Find cpp program and necessary flags for use in pre-processing text files ++# such as man pages and config files ++AC_DEFUN([XORG_PROG_RAWCPP],[ ++AC_REQUIRE([AC_PROG_CPP]) ++AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], ++ [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) + +-# serial 9 ++# Check for flag to avoid builtin definitions - assumes unix is predefined, ++# which is not the best choice for supporting other OS'es, but covers most ++# of the ones we need for now. ++AC_MSG_CHECKING([if $RAWCPP requires -undef]) ++AC_LANG_CONFTEST([Does cpp redefine unix ?]) ++if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then ++ AC_MSG_RESULT([no]) ++else ++ if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then ++ RAWCPPFLAGS=-undef ++ AC_MSG_RESULT([yes]) ++ # under Cygwin unix is still defined even with -undef ++ elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then ++ RAWCPPFLAGS="-undef -ansi" ++ AC_MSG_RESULT([yes, with -ansi]) ++ else ++ AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) ++ fi ++fi ++rm -f conftest.$ac_ext + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++AC_MSG_CHECKING([if $RAWCPP requires -traditional]) ++AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) ++if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then ++ AC_MSG_RESULT([no]) + else +- $1_TRUE='#' +- $1_FALSE= ++ if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then ++ RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) ++ fi + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) ++rm -f conftest.$ac_ext ++AC_SUBST(RAWCPPFLAGS) ++]) # XORG_PROG_RAWCPP + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +-# Free Software Foundation, Inc. ++# XORG_MANPAGE_SECTIONS() ++# ----------------------- ++# Minimum version: 1.0.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 10 +- +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++# Determine which sections man pages go in for the different man page types ++# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. ++# Not sure if there's any better way than just hardcoding by OS name. ++# Override default settings by setting environment variables + ++AC_DEFUN([XORG_MANPAGE_SECTIONS],[ ++AC_REQUIRE([AC_CANONICAL_HOST]) + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl ++if test x$APP_MAN_SUFFIX = x ; then ++ APP_MAN_SUFFIX=1 ++fi ++if test x$APP_MAN_DIR = x ; then ++ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ++fi + +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++if test x$LIB_MAN_SUFFIX = x ; then ++ LIB_MAN_SUFFIX=3 ++fi ++if test x$LIB_MAN_DIR = x ; then ++ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ++fi + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub ++if test x$FILE_MAN_SUFFIX = x ; then ++ case $host_os in ++ solaris*) FILE_MAN_SUFFIX=4 ;; ++ *) FILE_MAN_SUFFIX=5 ;; ++ esac ++fi ++if test x$FILE_MAN_DIR = x ; then ++ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ++fi + +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac]) ++if test x$MISC_MAN_SUFFIX = x ; then ++ case $host_os in ++ solaris*) MISC_MAN_SUFFIX=5 ;; ++ *) MISC_MAN_SUFFIX=7 ;; ++ esac ++fi ++if test x$MISC_MAN_DIR = x ; then ++ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ++fi + +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++if test x$DRIVER_MAN_SUFFIX = x ; then ++ case $host_os in ++ solaris*) DRIVER_MAN_SUFFIX=7 ;; ++ *) DRIVER_MAN_SUFFIX=4 ;; ++ esac ++fi ++if test x$DRIVER_MAN_DIR = x ; then ++ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ++fi + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" +- case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; +- none) break ;; ++if test x$ADMIN_MAN_SUFFIX = x ; then ++ case $host_os in ++ solaris*) ADMIN_MAN_SUFFIX=1m ;; ++ *) ADMIN_MAN_SUFFIX=8 ;; + esac +- if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done ++fi ++if test x$ADMIN_MAN_DIR = x ; then ++ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' ++fi + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none ++ ++AC_SUBST([APP_MAN_SUFFIX]) ++AC_SUBST([LIB_MAN_SUFFIX]) ++AC_SUBST([FILE_MAN_SUFFIX]) ++AC_SUBST([MISC_MAN_SUFFIX]) ++AC_SUBST([DRIVER_MAN_SUFFIX]) ++AC_SUBST([ADMIN_MAN_SUFFIX]) ++AC_SUBST([APP_MAN_DIR]) ++AC_SUBST([LIB_MAN_DIR]) ++AC_SUBST([FILE_MAN_DIR]) ++AC_SUBST([MISC_MAN_DIR]) ++AC_SUBST([DRIVER_MAN_DIR]) ++AC_SUBST([ADMIN_MAN_DIR]) ++]) # XORG_MANPAGE_SECTIONS ++ ++# XORG_CHECK_LINUXDOC ++# ------------------- ++# Minimum version: 1.0.0 ++# ++# Defines the variable MAKE_TEXT if the necessary tools and ++# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. ++# Whether or not the necessary tools and files are found can be checked ++# with the AM_CONDITIONAL "BUILD_LINUXDOC" ++AC_DEFUN([XORG_CHECK_LINUXDOC],[ ++if test x$XORG_SGML_PATH = x ; then ++ XORG_SGML_PATH=$prefix/share/sgml + fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++HAVE_DEFS_ENT= + ++if test x"$cross_compiling" = x"yes" ; then ++ HAVE_DEFS_ENT=no ++else ++ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) ++fi + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++AC_PATH_PROG(LINUXDOC, linuxdoc) ++AC_PATH_PROG(PS2PDF, ps2pdf) + ++AC_MSG_CHECKING([Whether to build documentation]) + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' ++if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then ++ BUILDDOC=yes ++else ++ BUILDDOC=no + fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_MSG_RESULT([$BUILDDOC]) + +-#serial 5 ++AC_MSG_CHECKING([Whether to build pdf documentation]) + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +- done +-} +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then ++ BUILDPDFDOC=yes ++else ++ BUILDPDFDOC=no ++fi + ++AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++AC_MSG_RESULT([$BUILDPDFDOC]) + +-# Do all the work for Automake. -*- Autoconf -*- ++MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" ++MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" ++MAKE_PDF="$PS2PDF" ++MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. ++AC_SUBST(MAKE_TEXT) ++AC_SUBST(MAKE_PS) ++AC_SUBST(MAKE_PDF) ++AC_SUBST(MAKE_HTML) ++]) # XORG_CHECK_LINUXDOC ++ ++# XORG_CHECK_DOCBOOK ++# ------------------- ++# Minimum version: 1.0.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Checks for the ability to build output formats from SGML DocBook source. ++# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" ++# indicates whether the necessary tools and files are found and, if set, ++# $(MAKE_XXX) blah.sgml will produce blah.xxx. ++AC_DEFUN([XORG_CHECK_DOCBOOK],[ ++if test x$XORG_SGML_PATH = x ; then ++ XORG_SGML_PATH=$prefix/share/sgml ++fi ++HAVE_DEFS_ENT= ++BUILDTXTDOC=no ++BUILDPDFDOC=no ++BUILDPSDOC=no ++BUILDHTMLDOC=no + +-# serial 16 ++AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++AC_PATH_PROG(DOCBOOKPS, docbook2ps) ++AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) ++AC_PATH_PROG(DOCBOOKHTML, docbook2html) ++AC_PATH_PROG(DOCBOOKTXT, docbook2txt) + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi ++AC_MSG_CHECKING([Whether to build text documentation]) ++if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && ++ test x$BUILD_TXTDOC != xno; then ++ BUILDTXTDOC=yes + fi ++AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) ++AC_MSG_RESULT([$BUILDTXTDOC]) + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi ++AC_MSG_CHECKING([Whether to build PDF documentation]) ++if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && ++ test x$BUILD_PDFDOC != xno; then ++ BUILDPDFDOC=yes + fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) ++AC_MSG_RESULT([$BUILDPDFDOC]) + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++AC_MSG_CHECKING([Whether to build PostScript documentation]) ++if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && ++ test x$BUILD_PSDOC != xno; then ++ BUILDPSDOC=yes ++fi ++AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) ++AC_MSG_RESULT([$BUILDPSDOC]) + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +-]) ++AC_MSG_CHECKING([Whether to build HTML documentation]) ++if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && ++ test x$BUILD_HTMLDOC != xno; then ++ BUILDHTMLDOC=yes ++fi ++AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) ++AC_MSG_RESULT([$BUILDHTMLDOC]) + +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" ++MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" ++MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" ++MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" + ++AC_SUBST(MAKE_TEXT) ++AC_SUBST(MAKE_PS) ++AC_SUBST(MAKE_PDF) ++AC_SUBST(MAKE_HTML) ++]) # XORG_CHECK_DOCBOOK + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. ++# XORG_CHECK_MALLOC_ZERO ++# ---------------------- ++# Minimum version: 1.0.0 ++# ++# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if ++# malloc(0) returns NULL. Packages should add one of these cflags to ++# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. ++AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ ++AC_ARG_ENABLE(malloc0returnsnull, ++ AS_HELP_STRING([--enable-malloc0returnsnull], ++ [malloc(0) returns NULL (default: auto)]), ++ [MALLOC_ZERO_RETURNS_NULL=$enableval], ++ [MALLOC_ZERO_RETURNS_NULL=auto]) + +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +- +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac ++AC_MSG_CHECKING([whether malloc(0) returns NULL]) ++if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then ++ AC_RUN_IFELSE([ ++char *malloc(); ++char *realloc(); ++char *calloc(); ++main() { ++ char *m0, *r0, *c0, *p; ++ m0 = malloc(0); ++ p = malloc(10); ++ r0 = realloc(p,0); ++ c0 = calloc(0); ++ exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); ++}], ++ [MALLOC_ZERO_RETURNS_NULL=yes], ++ [MALLOC_ZERO_RETURNS_NULL=no]) + fi +-AC_SUBST(install_sh)]) +- +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 2 ++AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. ++if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then ++ MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" ++ XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS ++ XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" + else +- am__leading_dot=_ ++ MALLOC_ZERO_CFLAGS="" ++ XMALLOC_ZERO_CFLAGS="" ++ XTMALLOC_ZERO_CFLAGS="" + fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++AC_SUBST([MALLOC_ZERO_CFLAGS]) ++AC_SUBST([XMALLOC_ZERO_CFLAGS]) ++AC_SUBST([XTMALLOC_ZERO_CFLAGS]) ++]) # XORG_CHECK_MALLOC_ZERO + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. ++# XORG_WITH_LINT() ++# ---------------- ++# Minimum version: 1.1.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 5 ++# Sets up flags for source checkers such as lint and sparse if --with-lint ++# is specified. (Use --with-lint=sparse for sparse.) ++# Sets $LINT to name of source checker passed with --with-lint (default: lint) ++# Sets $LINT_FLAGS to flags to pass to source checker ++# Sets LINT automake conditional if enabled (default: disabled) ++# ++AC_DEFUN([XORG_WITH_LINT],[ + +-# AM_MAINTAINER_MODE([DEFAULT-MODE]) +-# ---------------------------------- +-# Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user +-# can override the default with the --enable/--disable switch. +-AC_DEFUN([AM_MAINTAINER_MODE], +-[m4_case(m4_default([$1], [disable]), +- [enable], [m4_define([am_maintainer_other], [disable])], +- [disable], [m4_define([am_maintainer_other], [enable])], +- [m4_define([am_maintainer_other], [enable]) +- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +- dnl maintainer-mode's default is 'disable' unless 'enable' is passed +- AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST([MAINT])dnl +-] +-) ++# Allow checking code with lint, sparse, etc. ++AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], ++ [Use a lint-style source code checker (default: disabled)])], ++ [use_lint=$withval], [use_lint=no]) ++if test "x$use_lint" = "xyes" ; then ++ LINT="lint" ++else ++ LINT="$use_lint" ++fi ++if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then ++ case $LINT in ++ lint|*/lint) ++ case $host_os in ++ solaris*) ++ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" ++ ;; ++ esac ++ ;; ++ esac ++fi + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++AC_SUBST(LINT) ++AC_SUBST(LINT_FLAGS) ++AM_CONDITIONAL(LINT, [test x$LINT != xno]) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++]) # XORG_WITH_LINT + +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. ++# XORG_LINT_LIBRARY(LIBNAME) ++# -------------------------- ++# Minimum version: 1.1.0 ++# ++# Sets up flags for building lint libraries for checking programs that call ++# functions in the library. ++# Disabled by default, enable with --enable-lint-library ++# Sets: ++# @LINTLIB@ - name of lint library file to make ++# MAKE_LINT_LIB - automake conditional + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo this is the am__doit target +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac ++AC_DEFUN([XORG_LINT_LIBRARY],[ ++AC_REQUIRE([XORG_WITH_LINT]) ++# Build lint "library" for more indepth checks of programs calling this library ++AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], ++ [Create lint library (default: disabled)])], ++ [make_lint_lib=$enableval], [make_lint_lib=no]) ++if test "x$make_lint_lib" != "xno" ; then ++ if test "x$LINT" = "xno" ; then ++ AC_MSG_ERROR([Cannot make lint library without --with-lint]) ++ fi ++ if test "x$make_lint_lib" = "xyes" ; then ++ LINTLIB=llib-l$1.ln ++ else ++ LINTLIB=$make_lint_lib ++ fi + fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) ++AC_SUBST(LINTLIB) ++AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++]) # XORG_LINT_LIBRARY + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. ++# XORG_CWARNFLAGS ++# --------------- ++# Minimum version: 1.2.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 6 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++# Defines CWARNFLAGS to enable C compiler warnings. ++# ++AC_DEFUN([XORG_CWARNFLAGS], [ ++AC_REQUIRE([AC_PROG_CC]) ++if test "x$GCC" = xyes ; then ++ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ ++-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ ++-Wbad-function-cast" ++ case `$CC -dumpversion` in ++ 3.4.* | 4.*) ++ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" ++ ;; ++ esac ++else ++ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) ++ if test "x$SUNCC" = "xyes"; then ++ CWARNFLAGS="-v" ++ fi ++fi ++AC_SUBST(CWARNFLAGS) ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ++]) # XORG_CWARNFLAGS + ++# XORG_STRICT_OPTION ++# ----------------------- ++# Minimum version: 1.3.0 ++# ++# Add configure option to enable strict compilation ++AC_DEFUN([XORG_STRICT_OPTION], [ ++AC_REQUIRE([AC_PROG_CC]) ++AC_REQUIRE([AC_PROG_CC_C99]) ++AC_REQUIRE([XORG_CWARNFLAGS]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++AC_ARG_ENABLE(strict-compilation, ++ AS_HELP_STRING([--enable-strict-compilation], ++ [Enable all warnings from compiler and make them errors (default: disabled)]), ++ [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) ++if test "x$STRICT_COMPILE" = "xyes"; then ++ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) ++ AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) ++ if test "x$GCC" = xyes ; then ++ STRICT_CFLAGS="-pedantic -Werror" ++ elif test "x$SUNCC" = "xyes"; then ++ STRICT_CFLAGS="-errwarn" ++ elif test "x$INTELCC" = "xyes"; then ++ STRICT_CFLAGS="-Werror" ++ fi + fi +-]) ++CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" ++AC_SUBST([CWARNFLAGS]) ++]) # XORG_STRICT_OPTION + +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# XORG_DEFAULT_OPTIONS ++# -------------------- ++# Minimum version: 1.3.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Defines default options for X.Org modules. ++# ++AC_DEFUN([XORG_DEFAULT_OPTIONS], [ ++XORG_CWARNFLAGS ++XORG_STRICT_OPTION ++XORG_RELEASE_VERSION ++XORG_CHANGELOG ++XORG_MANPAGE_SECTIONS ++]) # XORG_DEFAULT_OPTIONS ++dnl Copyright 2005 Red Hat, Inc ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation. ++dnl ++dnl The above copyright notice and this permission notice shall be included ++dnl in all copies or substantial portions of the Software. ++dnl ++dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR ++dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++dnl OTHER DEALINGS IN THE SOFTWARE. ++dnl ++dnl Except as contained in this notice, the name of the copyright holders shall ++dnl not be used in advertising or otherwise to promote the sale, use or ++dnl other dealings in this Software without prior written authorization ++dnl from the copyright holders. ++dnl + +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac ++# XORG_RELEASE_VERSION ++# -------------------- ++# Adds --with/without-release-string and changes the PACKAGE and ++# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If ++# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also ++# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. ++ ++AC_DEFUN([XORG_RELEASE_VERSION],[ ++ AC_ARG_WITH(release-version, ++ AS_HELP_STRING([--with-release-version=STRING], ++ [Use release version string in package name]), ++ [RELEASE_VERSION="$withval"], ++ [RELEASE_VERSION=""]) ++ if test "x$RELEASE_VERSION" != "x"; then ++ PACKAGE="$PACKAGE-$RELEASE_VERSION" ++ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" ++ AC_MSG_NOTICE([Building with package name set to $PACKAGE]) ++ fi ++ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], ++ [`echo $PACKAGE_VERSION | cut -d . -f 1`], ++ [Major version of this package]) ++ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` ++ if test "x$PVM" = "x"; then ++ PVM="0" ++ fi ++ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], ++ [$PVM], ++ [Minor version of this package]) ++ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` ++ if test "x$PVP" = "x"; then ++ PVP="0" ++ fi ++ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], ++ [$PVP], ++ [Patch version of this package]) + ]) + +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# XORG_CHANGELOG() ++# ---------------- ++# Minimum version: 1.2.0 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++# Defines the variable CHANGELOG_CMD as the command to generate ++# ChangeLog from git. ++# ++# Arrange that distcleancheck ignores ChangeLog left over by distclean. ++# ++AC_DEFUN([XORG_CHANGELOG], [ ++CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ ++mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ ++echo 'git directory not found: installing possibly empty changelog.' >&2)" ++AC_SUBST([CHANGELOG_CMD]) ++AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) ++]) # XORG_CHANGELOG + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ ++dnl ++dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation. ++dnl ++dnl The above copyright notice and this permission notice shall be included ++dnl in all copies or substantial portions of the Software. ++dnl ++dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR ++dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++dnl OTHER DEALINGS IN THE SOFTWARE. ++dnl ++dnl Except as contained in this notice, the name of the copyright holders shall ++dnl not be used in advertising or otherwise to promote the sale, use or ++dnl other dealings in this Software without prior written authorization ++dnl from the copyright holders. ++dnl + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++# XTRANS_TCP_FLAGS() ++# ------------------ ++# Find needed libraries for TCP sockets, and check for IPv6 support ++AC_DEFUN([XTRANS_TCP_FLAGS],[ ++ # SVR4 hides these in libraries other than libc ++ AC_SEARCH_LIBS(socket, [socket]) ++ AC_SEARCH_LIBS(gethostbyname, [nsl]) + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ # Needs to come after above checks for libsocket & libnsl for SVR4 systems ++ AC_ARG_ENABLE(ipv6, ++ AC_HELP_STRING([--enable-IPv6],[Enable IPv6 support]), ++ [IPV6CONN=$enableval], ++ [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) ++ AC_MSG_CHECKING([if IPv6 support should be built]) ++ if test "$IPV6CONN" = "yes"; then ++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) ++ fi ++ AC_MSG_RESULT($IPV6CONN) + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ # 4.3BSD-Reno added a new member to struct sockaddr_in ++ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], ++ AC_DEFINE([BSD44SOCKETS],1, ++ [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ ++#include ++#include ++#include ++ ]) + +-# serial 5 ++ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. ++ AC_CHECK_TYPES([socklen_t], [], [], [ ++AC_INCLUDES_DEFAULT ++#include ]) ++ ++]) # XTRANS_TCP_FLAGS + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +-esac ++# XTRANS_CONNECTION_FLAGS() ++# ------------------------- ++# Standard checks for which Xtrans transports to use by the Xorg packages ++# that use Xtrans functions ++AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ AC_REQUIRE([AC_TYPE_SIGNAL]) ++ [case $host_os in ++ mingw*) unixdef="no" ;; ++ *) unixdef="yes" ;; ++ esac] ++ AC_ARG_ENABLE(unix-transport, ++ AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]), ++ [UNIXCONN=$enableval], [UNIXCONN=$unixdef]) ++ AC_MSG_CHECKING([if Xtrans should support UNIX socket connections]) ++ if test "$UNIXCONN" = "yes"; then ++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) ++ fi ++ AC_MSG_RESULT($UNIXCONN) ++ AC_ARG_ENABLE(tcp-transport, ++ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), ++ [TCPCONN=$enableval], [TCPCONN=yes]) ++ AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) ++ AC_MSG_RESULT($TCPCONN) ++ if test "$TCPCONN" = "yes"; then ++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) ++ XTRANS_TCP_FLAGS ++ fi ++ [case $host_os in ++ solaris*|sco*|sysv4*) localdef="yes" ;; ++ *) localdef="no" ;; ++ esac] ++ AC_ARG_ENABLE(local-transport, ++ AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]), ++ [LOCALCONN=$enableval], [LOCALCONN=$localdef]) ++ AC_MSG_CHECKING([if Xtrans should support os-specific local connections]) ++ AC_MSG_RESULT($LOCALCONN) ++ if test "$LOCALCONN" = "yes"; then ++ AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) ++ fi ++ ++]) # XTRANS_CONNECTION_FLAGS + +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++# XTRANS_SECURE_RPC_FLAGS() ++# ------------------------- ++# Check for Secure RPC functions - must come after XTRANS_TCP_FLAGS ++# so that any necessary networking libraries are already found ++AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], ++[AC_REQUIRE([XTRANS_TCP_FLAGS]) ++ AC_ARG_ENABLE(secure-rpc, ++ AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), ++ [SECURE_RPC=$enableval], [SECURE_RPC="try"]) + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) ++ if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then ++ FOUND_SECURE_RPC="no" ++ AC_CHECK_FUNCS([authdes_seccreate authdes_create], ++ [FOUND_SECURE_RPC="yes"]) ++ if test "x$FOUND_SECURE_RPC" = "xno" ; then ++ if test "x$SECURE_RPC" = "xyes" ; then ++ AC_MSG_ERROR([Secure RPC requested, but required functions not found]) ++ fi ++ SECURE_RPC="no" ++ else ++ dnl FreeBSD keeps getsecretkey in librpcsvc ++ AC_SEARCH_LIBS(getsecretkey, [rpcsvc]) ++ SECURE_RPC="yes" ++ fi ++ fi ++ AC_MSG_CHECKING([if Secure RPC authentication ("SUN-DES-1") should be supported]) ++ if test "x$SECURE_RPC" = "xyes" ; then ++ AC_DEFINE(SECURE_RPC, 1, [Support Secure RPC ("SUN-DES-1") authentication for X11 clients]) ++ fi ++ AC_MSG_RESULT($SECURE_RPC) ++]) # XTRANS_SECURE_RPC_FLAGS + +-# Copyright (C) 2009 Free Software Foundation, Inc. ++ ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 1 +- +-# AM_SILENT_RULES([DEFAULT]) +-# -------------------------- +-# Enable less verbose build rules; with the default set to DEFAULT +-# (`yes' being less verbose, `no' or empty being verbose). +-AC_DEFUN([AM_SILENT_RULES], +-[AC_ARG_ENABLE([silent-rules], +-[ --enable-silent-rules less verbose build output (undo: `make V=1') +- --disable-silent-rules verbose build output (undo: `make V=0')]) +-case $enable_silent_rules in +-yes) AM_DEFAULT_VERBOSITY=0;; +-no) AM_DEFAULT_VERBOSITY=1;; +-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +-esac +-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +-AM_BACKSLASH='\' +-AC_SUBST([AM_BACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.11])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# Figure out how to run the assembler. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) ++# serial 5 + +-# AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++# AM_PROG_AS ++# ---------- ++AC_DEFUN([AM_PROG_AS], ++[# By default we simply use the C compiler to build assembly code. ++AC_REQUIRE([AC_PROG_CC]) ++test "${CCAS+set}" = set || CCAS=$CC ++test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS ++AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) ++AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) ++_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl ++]) + +-# Check how to create a tarball. -*- Autoconf -*- ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. + # +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. + # +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir +- +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR +- +-m4_include([m4/ac_define_dir.m4]) +-m4_include([m4/dolt.m4]) +-m4_include([m4/libtool.m4]) +-m4_include([m4/ltoptions.m4]) +-m4_include([m4/ltsugar.m4]) +-m4_include([m4/ltversion.m4]) +-m4_include([m4/lt~obsolete.m4]) +-dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. +-dnl +-dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. +-dnl +-dnl Permission is hereby granted, free of charge, to any person obtaining a +-dnl copy of this software and associated documentation files (the +-dnl "Software"), to deal in the Software without restriction, including +-dnl without limitation the rights to use, copy, modify, merge, publish, +-dnl distribute, and/or sell copies of the Software, and to permit persons +-dnl to whom the Software is furnished to do so, provided that the above +-dnl copyright notice(s) and this permission notice appear in all copies of +-dnl the Software and that both the above copyright notice(s) and this +-dnl permission notice appear in supporting documentation. +-dnl +-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +-dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +-dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +-dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +-dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +-dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +-dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +-dnl +-dnl Except as contained in this notice, the name of a copyright holder +-dnl shall not be used in advertising or otherwise to promote the sale, use +-dnl or other dealings in this Software without prior written authorization +-dnl of the copyright holder. +- +-# XORG_MACROS_VERSION(required-version) +-# ------------------------------------- +-# Minimum version: 1.1.0 +-# +-# If you're using a macro added in Version 1.1 or newer, include this in +-# your configure.ac with the minimum required version, such as: +-# XORG_MACROS_VERSION(1.1) ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir + # +-# To ensure that this macro is defined, also add: +-# m4_ifndef([XORG_MACROS_VERSION], +-# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])]) ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. + # ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. + # +-# See the "minimum version" comment for each macro you use to see what +-# version you require. +-m4_defun([XORG_MACROS_VERSION],[ +-m4_define([vers_have], [1.3.0]) +-m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) +-m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) +-m4_if(m4_cmp(maj_have, maj_needed), 0,, +- [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])]) +-m4_if(m4_version_compare(vers_have, [$1]), -1, +- [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])]) +-m4_undefine([vers_have]) +-m4_undefine([maj_have]) +-m4_undefine([maj_needed]) +-]) # XORG_MACROS_VERSION ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. + +-# XORG_PROG_RAWCPP() +-# ------------------ +-# Minimum version: 1.0.0 ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# Free Software Foundation, Inc. + # +-# Find cpp program and necessary flags for use in pre-processing text files +-# such as man pages and config files +-AC_DEFUN([XORG_PROG_RAWCPP],[ +-AC_REQUIRE([AC_PROG_CPP]) +-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], +- [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# Check for flag to avoid builtin definitions - assumes unix is predefined, +-# which is not the best choice for supporting other OS'es, but covers most +-# of the ones we need for now. +-AC_MSG_CHECKING([if $RAWCPP requires -undef]) +-AC_LANG_CONFTEST([Does cpp redefine unix ?]) +-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- AC_MSG_RESULT([no]) +-else +- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- RAWCPPFLAGS=-undef +- AC_MSG_RESULT([yes]) +- # under Cygwin unix is still defined even with -undef +- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- RAWCPPFLAGS="-undef -ansi" +- AC_MSG_RESULT([yes, with -ansi]) +- else +- AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) +- fi +-fi +-rm -f conftest.$ac_ext ++# serial 9 + +-AC_MSG_CHECKING([if $RAWCPP requires -traditional]) +-AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) +-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +- AC_MSG_RESULT([no]) ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' + else +- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) +- fi ++ $1_TRUE='#' ++ $1_FALSE= + fi +-rm -f conftest.$ac_ext +-AC_SUBST(RAWCPPFLAGS) +-]) # XORG_PROG_RAWCPP ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) + +-# XORG_MANPAGE_SECTIONS() +-# ----------------------- +-# Minimum version: 1.0.0 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 ++# Free Software Foundation, Inc. + # +-# Determine which sections man pages go in for the different man page types +-# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. +-# Not sure if there's any better way than just hardcoding by OS name. +-# Override default settings by setting environment variables ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([XORG_MANPAGE_SECTIONS],[ +-AC_REQUIRE([AC_CANONICAL_HOST]) ++# serial 10 + +-if test x$APP_MAN_SUFFIX = x ; then +- APP_MAN_SUFFIX=1 +-fi +-if test x$APP_MAN_DIR = x ; then +- APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' +-fi ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + +-if test x$LIB_MAN_SUFFIX = x ; then +- LIB_MAN_SUFFIX=3 +-fi +-if test x$LIB_MAN_DIR = x ; then +- LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' +-fi +- +-if test x$FILE_MAN_SUFFIX = x ; then +- case $host_os in +- solaris*) FILE_MAN_SUFFIX=4 ;; +- *) FILE_MAN_SUFFIX=5 ;; +- esac +-fi +-if test x$FILE_MAN_DIR = x ; then +- FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' +-fi +- +-if test x$MISC_MAN_SUFFIX = x ; then +- case $host_os in +- solaris*) MISC_MAN_SUFFIX=5 ;; +- *) MISC_MAN_SUFFIX=7 ;; +- esac +-fi +-if test x$MISC_MAN_DIR = x ; then +- MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' +-fi +- +-if test x$DRIVER_MAN_SUFFIX = x ; then +- case $host_os in +- solaris*) DRIVER_MAN_SUFFIX=7 ;; +- *) DRIVER_MAN_SUFFIX=4 ;; +- esac +-fi +-if test x$DRIVER_MAN_DIR = x ; then +- DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' +-fi +- +-if test x$ADMIN_MAN_SUFFIX = x ; then +- case $host_os in +- solaris*) ADMIN_MAN_SUFFIX=1m ;; +- *) ADMIN_MAN_SUFFIX=8 ;; +- esac +-fi +-if test x$ADMIN_MAN_DIR = x ; then +- ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' +-fi + ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl + +-AC_SUBST([APP_MAN_SUFFIX]) +-AC_SUBST([LIB_MAN_SUFFIX]) +-AC_SUBST([FILE_MAN_SUFFIX]) +-AC_SUBST([MISC_MAN_SUFFIX]) +-AC_SUBST([DRIVER_MAN_SUFFIX]) +-AC_SUBST([ADMIN_MAN_SUFFIX]) +-AC_SUBST([APP_MAN_DIR]) +-AC_SUBST([LIB_MAN_DIR]) +-AC_SUBST([FILE_MAN_DIR]) +-AC_SUBST([MISC_MAN_DIR]) +-AC_SUBST([DRIVER_MAN_DIR]) +-AC_SUBST([ADMIN_MAN_DIR]) +-]) # XORG_MANPAGE_SECTIONS ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + +-# XORG_CHECK_LINUXDOC +-# ------------------- +-# Minimum version: 1.0.0 +-# +-# Defines the variable MAKE_TEXT if the necessary tools and +-# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. +-# Whether or not the necessary tools and files are found can be checked +-# with the AM_CONDITIONAL "BUILD_LINUXDOC" +-AC_DEFUN([XORG_CHECK_LINUXDOC],[ +-if test x$XORG_SGML_PATH = x ; then +- XORG_SGML_PATH=$prefix/share/sgml +-fi +-HAVE_DEFS_ENT= ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +-if test x"$cross_compiling" = x"yes" ; then +- HAVE_DEFS_ENT=no +-else +- AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +-fi ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) + +-AC_PATH_PROG(LINUXDOC, linuxdoc) +-AC_PATH_PROG(PS2PDF, ps2pdf) ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +-AC_MSG_CHECKING([Whether to build documentation]) ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +-if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then +- BUILDDOC=yes ++ cd .. ++ rm -rf conftest.dir + else +- BUILDDOC=no ++ am_cv_$1_dependencies_compiler_type=none + fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) + +-AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) + +-AC_MSG_RESULT([$BUILDDOC]) ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +-AC_MSG_CHECKING([Whether to build pdf documentation]) + +-if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then +- BUILDPDFDOC=yes +-else +- BUILDPDFDOC=no ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' + fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +-AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +-AC_MSG_RESULT([$BUILDPDFDOC]) ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +-MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" +-MAKE_PDF="$PS2PDF" +-MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" ++#serial 5 + +-AC_SUBST(MAKE_TEXT) +-AC_SUBST(MAKE_PS) +-AC_SUBST(MAKE_PDF) +-AC_SUBST(MAKE_HTML) +-]) # XORG_CHECK_LINUXDOC ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +-# XORG_CHECK_DOCBOOK +-# ------------------- +-# Minimum version: 1.0.0 ++ ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. + # +-# Checks for the ability to build output formats from SGML DocBook source. +-# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" +-# indicates whether the necessary tools and files are found and, if set, +-# $(MAKE_XXX) blah.sgml will produce blah.xxx. +-AC_DEFUN([XORG_CHECK_DOCBOOK],[ +-if test x$XORG_SGML_PATH = x ; then +- XORG_SGML_PATH=$prefix/share/sgml +-fi +-HAVE_DEFS_ENT= +-BUILDTXTDOC=no +-BUILDPDFDOC=no +-BUILDPSDOC=no +-BUILDHTMLDOC=no ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) ++# Do all the work for Automake. -*- Autoconf -*- + +-AC_PATH_PROG(DOCBOOKPS, docbook2ps) +-AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) +-AC_PATH_PROG(DOCBOOKHTML, docbook2html) +-AC_PATH_PROG(DOCBOOKTXT, docbook2txt) ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_MSG_CHECKING([Whether to build text documentation]) +-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && +- test x$BUILD_TXTDOC != xno; then +- BUILDTXTDOC=yes +-fi +-AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) +-AC_MSG_RESULT([$BUILDTXTDOC]) ++# serial 16 + +-AC_MSG_CHECKING([Whether to build PDF documentation]) +-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && +- test x$BUILD_PDFDOC != xno; then +- BUILDPDFDOC=yes +-fi +-AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) +-AC_MSG_RESULT([$BUILDPDFDOC]) ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +-AC_MSG_CHECKING([Whether to build PostScript documentation]) +-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && +- test x$BUILD_PSDOC != xno; then +- BUILDPSDOC=yes ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.62])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi +-AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) +-AC_MSG_RESULT([$BUILDPSDOC]) + +-AC_MSG_CHECKING([Whether to build HTML documentation]) +-if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && +- test x$BUILD_HTMLDOC != xno; then +- BUILDHTMLDOC=yes ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi + fi +-AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) +-AC_MSG_RESULT([$BUILDHTMLDOC]) +- +-MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" +-MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" +-MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" +-MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" ++AC_SUBST([CYGPATH_W]) + +-AC_SUBST(MAKE_TEXT) +-AC_SUBST(MAKE_PS) +-AC_SUBST(MAKE_PDF) +-AC_SUBST(MAKE_HTML) +-]) # XORG_CHECK_DOCBOOK ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +-# XORG_CHECK_MALLOC_ZERO +-# ---------------------- +-# Minimum version: 1.0.0 +-# +-# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if +-# malloc(0) returns NULL. Packages should add one of these cflags to +-# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. +-AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ +-AC_ARG_ENABLE(malloc0returnsnull, +- AS_HELP_STRING([--enable-malloc0returnsnull], +- [malloc(0) returns NULL (default: auto)]), +- [MALLOC_ZERO_RETURNS_NULL=$enableval], +- [MALLOC_ZERO_RETURNS_NULL=auto]) ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +-AC_MSG_CHECKING([whether malloc(0) returns NULL]) +-if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then +- AC_RUN_IFELSE([ +-char *malloc(); +-char *realloc(); +-char *calloc(); +-main() { +- char *m0, *r0, *c0, *p; +- m0 = malloc(0); +- p = malloc(10); +- r0 = realloc(p,0); +- c0 = calloc(0); +- exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); +-}], +- [MALLOC_ZERO_RETURNS_NULL=yes], +- [MALLOC_ZERO_RETURNS_NULL=no]) +-fi +-AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++]) + +-if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then +- MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" +- XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS +- XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" +-else +- MALLOC_ZERO_CFLAGS="" +- XMALLOC_ZERO_CFLAGS="" +- XTMALLOC_ZERO_CFLAGS="" +-fi ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +-AC_SUBST([MALLOC_ZERO_CFLAGS]) +-AC_SUBST([XMALLOC_ZERO_CFLAGS]) +-AC_SUBST([XTMALLOC_ZERO_CFLAGS]) +-]) # XORG_CHECK_MALLOC_ZERO + +-# XORG_WITH_LINT() +-# ---------------- +-# Minimum version: 1.1.0 ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. + # +-# Sets up flags for source checkers such as lint and sparse if --with-lint +-# is specified. (Use --with-lint=sparse for sparse.) +-# Sets $LINT to name of source checker passed with --with-lint (default: lint) +-# Sets $LINT_FLAGS to flags to pass to source checker +-# Sets LINT automake conditional if enabled (default: disabled) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++AC_SUBST(install_sh)]) ++ ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. + # +-AC_DEFUN([XORG_WITH_LINT],[ ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# Allow checking code with lint, sparse, etc. +-AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], +- [Use a lint-style source code checker (default: disabled)])], +- [use_lint=$withval], [use_lint=no]) +-if test "x$use_lint" = "xyes" ; then +- LINT="lint" ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. + else +- LINT="$use_lint" +-fi +-if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then +- case $LINT in +- lint|*/lint) +- case $host_os in +- solaris*) +- LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" +- ;; +- esac +- ;; +- esac ++ am__leading_dot=_ + fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + +-AC_SUBST(LINT) +-AC_SUBST(LINT_FLAGS) +-AM_CONDITIONAL(LINT, [test x$LINT != xno]) +- +-]) # XORG_WITH_LINT ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +-# XORG_LINT_LIBRARY(LIBNAME) +-# -------------------------- +-# Minimum version: 1.1.0 +-# +-# Sets up flags for building lint libraries for checking programs that call +-# functions in the library. +-# Disabled by default, enable with --enable-lint-library +-# Sets: +-# @LINTLIB@ - name of lint library file to make +-# MAKE_LINT_LIB - automake conditional ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. + # ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([XORG_LINT_LIBRARY],[ +-AC_REQUIRE([XORG_WITH_LINT]) +-# Build lint "library" for more indepth checks of programs calling this library +-AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], +- [Create lint library (default: disabled)])], +- [make_lint_lib=$enableval], [make_lint_lib=no]) +-if test "x$make_lint_lib" != "xno" ; then +- if test "x$LINT" = "xno" ; then +- AC_MSG_ERROR([Cannot make lint library without --with-lint]) +- fi +- if test "x$make_lint_lib" = "xyes" ; then +- LINTLIB=llib-l$1.ln +- else +- LINTLIB=$make_lint_lib +- fi +-fi +-AC_SUBST(LINTLIB) +-AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) ++# serial 5 + +-]) # XORG_LINT_LIBRARY ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. ++AC_DEFUN([AM_MAINTAINER_MODE], ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++] ++) + +-# XORG_CWARNFLAGS +-# --------------- +-# Minimum version: 1.2.0 +-# +-# Defines CWARNFLAGS to enable C compiler warnings. +-# +-AC_DEFUN([XORG_CWARNFLAGS], [ +-AC_REQUIRE([AC_PROG_CC]) +-if test "x$GCC" = xyes ; then +- CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ +--Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ +--Wbad-function-cast" +- case `$CC -dumpversion` in +- 3.4.* | 4.*) +- CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" +- ;; +- esac +-else +- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) +- if test "x$SUNCC" = "xyes"; then +- CWARNFLAGS="-v" +- fi +-fi +-AC_SUBST(CWARNFLAGS) +-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-]) # XORG_CWARNFLAGS ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +-# XORG_STRICT_OPTION +-# ----------------------- +-# Minimum version: 1.3.0 ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. + # +-# Add configure option to enable strict compilation +-AC_DEFUN([XORG_STRICT_OPTION], [ +-AC_REQUIRE([AC_PROG_CC]) +-AC_REQUIRE([AC_PROG_CC_C99]) +-AC_REQUIRE([XORG_CWARNFLAGS]) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_ARG_ENABLE(strict-compilation, +- AS_HELP_STRING([--enable-strict-compilation], +- [Enable all warnings from compiler and make them errors (default: disabled)]), +- [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) +-if test "x$STRICT_COMPILE" = "xyes"; then +- AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) +- AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) +- if test "x$GCC" = xyes ; then +- STRICT_CFLAGS="-pedantic -Werror" +- elif test "x$SUNCC" = "xyes"; then +- STRICT_CFLAGS="-errwarn" +- elif test "x$INTELCC" = "xyes"; then +- STRICT_CFLAGS="-Werror" +- fi +-fi +-CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" +-AC_SUBST([CWARNFLAGS]) +-]) # XORG_STRICT_OPTION ++# serial 4 + +-# XORG_DEFAULT_OPTIONS +-# -------------------- +-# Minimum version: 1.3.0 +-# +-# Defines default options for X.Org modules. +-# +-AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +-XORG_CWARNFLAGS +-XORG_STRICT_OPTION +-XORG_RELEASE_VERSION +-XORG_CHANGELOG +-XORG_MANPAGE_SECTIONS +-]) # XORG_DEFAULT_OPTIONS +-dnl Copyright 2005 Red Hat, Inc +-dnl +-dnl Permission to use, copy, modify, distribute, and sell this software and its +-dnl documentation for any purpose is hereby granted without fee, provided that +-dnl the above copyright notice appear in all copies and that both that +-dnl copyright notice and this permission notice appear in supporting +-dnl documentation. +-dnl +-dnl The above copyright notice and this permission notice shall be included +-dnl in all copies or substantial portions of the Software. +-dnl +-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +-dnl OTHER DEALINGS IN THE SOFTWARE. +-dnl +-dnl Except as contained in this notice, the name of the copyright holders shall +-dnl not be used in advertising or otherwise to promote the sale, use or +-dnl other dealings in this Software without prior written authorization +-dnl from the copyright holders. +-dnl ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) + +-# XORG_RELEASE_VERSION +-# -------------------- +-# Adds --with/without-release-string and changes the PACKAGE and +-# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If +-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +-# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. +- +-AC_DEFUN([XORG_RELEASE_VERSION],[ +- AC_ARG_WITH(release-version, +- AS_HELP_STRING([--with-release-version=STRING], +- [Use release version string in package name]), +- [RELEASE_VERSION="$withval"], +- [RELEASE_VERSION=""]) +- if test "x$RELEASE_VERSION" != "x"; then +- PACKAGE="$PACKAGE-$RELEASE_VERSION" +- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" +- AC_MSG_NOTICE([Building with package name set to $PACKAGE]) +- fi +- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], +- [`echo $PACKAGE_VERSION | cut -d . -f 1`], +- [Major version of this package]) +- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` +- if test "x$PVM" = "x"; then +- PVM="0" +- fi +- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], +- [$PVM], +- [Minor version of this package]) +- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` +- if test "x$PVP" = "x"; then +- PVP="0" +- fi +- AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], +- [$PVP], +- [Patch version of this package]) ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 6 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + ]) + +-# XORG_CHANGELOG() +-# ---------------- +-# Minimum version: 1.2.0 +-# +-# Defines the variable CHANGELOG_CMD as the command to generate +-# ChangeLog from git. +-# +-# Arrange that distcleancheck ignores ChangeLog left over by distclean. ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 5 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# Copyright (C) 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 1 ++ ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# (`yes' being less verbose, `no' or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], ++[ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0')]) ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. + # +-AC_DEFUN([XORG_CHANGELOG], [ +-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ +-mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +-echo 'git directory not found: installing possibly empty changelog.' >&2)" +-AC_SUBST([CHANGELOG_CMD]) +-AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) +-]) # XORG_CHANGELOG ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ +-dnl +-dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. +-dnl +-dnl Permission to use, copy, modify, distribute, and sell this software and its +-dnl documentation for any purpose is hereby granted without fee, provided that +-dnl the above copyright notice appear in all copies and that both that +-dnl copyright notice and this permission notice appear in supporting +-dnl documentation. +-dnl +-dnl The above copyright notice and this permission notice shall be included +-dnl in all copies or substantial portions of the Software. +-dnl +-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +-dnl OTHER DEALINGS IN THE SOFTWARE. +-dnl +-dnl Except as contained in this notice, the name of the copyright holders shall +-dnl not be used in advertising or otherwise to promote the sale, use or +-dnl other dealings in this Software without prior written authorization +-dnl from the copyright holders. +-dnl ++# serial 2 + +-# XTRANS_TCP_FLAGS() +-# ------------------ +-# Find needed libraries for TCP sockets, and check for IPv6 support +-AC_DEFUN([XTRANS_TCP_FLAGS],[ +- # SVR4 hides these in libraries other than libc +- AC_SEARCH_LIBS(socket, [socket]) +- AC_SEARCH_LIBS(gethostbyname, [nsl]) +- AC_HAVE_LIBRARY([ws2_32]) ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +- # Needs to come after above checks for libsocket & libnsl for SVR4 systems +- AC_ARG_ENABLE(ipv6, +- AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]), +- [IPV6CONN=$enableval], +- [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) +- AC_MSG_CHECKING([if IPv6 support should be built]) +- if test "$IPV6CONN" = "yes"; then +- AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) +- fi +- AC_MSG_RESULT($IPV6CONN) ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +- # 4.3BSD-Reno added a new member to struct sockaddr_in +- AC_CHECK_MEMBER([struct sockaddr_in.sin_len], +- AC_DEFINE([BSD44SOCKETS],1, +- [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ +-#include +-#include +-#include +- ]) ++# Check how to create a tarball. -*- Autoconf -*- + +- # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc. +- AC_CHECK_TYPES([socklen_t], [], [], [ +-AC_INCLUDES_DEFAULT +-#include ]) +- +-]) # XTRANS_TCP_FLAGS ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# XTRANS_CONNECTION_FLAGS() +-# ------------------------- +-# Standard checks for which Xtrans transports to use by the Xorg packages +-# that use Xtrans functions +-AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ +- AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_REQUIRE([AC_TYPE_SIGNAL]) +- [case $host_os in +- mingw*) unixdef="no" ;; +- *) unixdef="yes" ;; +- esac] +- AC_ARG_ENABLE(unix-transport, +- AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]), +- [UNIXCONN=$enableval], [UNIXCONN=$unixdef]) +- AC_MSG_CHECKING([if Xtrans should support UNIX socket connections]) +- if test "$UNIXCONN" = "yes"; then +- AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) +- fi +- AC_MSG_RESULT($UNIXCONN) +- AC_ARG_ENABLE(tcp-transport, +- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), +- [TCPCONN=$enableval], [TCPCONN=yes]) +- AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) +- AC_MSG_RESULT($TCPCONN) +- if test "$TCPCONN" = "yes"; then +- AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) +- XTRANS_TCP_FLAGS +- fi +- [case $host_os in +- solaris*|sco*|sysv4*) localdef="yes" ;; +- *) localdef="no" ;; +- esac] +- AC_ARG_ENABLE(local-transport, +- AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]), +- [LOCALCONN=$enableval], [LOCALCONN=$localdef]) +- AC_MSG_CHECKING([if Xtrans should support os-specific local connections]) +- AC_MSG_RESULT($LOCALCONN) +- if test "$LOCALCONN" = "yes"; then +- AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) +- fi +- +-]) # XTRANS_CONNECTION_FLAGS ++# serial 2 + ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +-# XTRANS_SECURE_RPC_FLAGS() +-# ------------------------- +-# Check for Secure RPC functions - must come after XTRANS_TCP_FLAGS +-# so that any necessary networking libraries are already found +-AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], +-[AC_REQUIRE([XTRANS_TCP_FLAGS]) +- AC_ARG_ENABLE(secure-rpc, +- AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), +- [SECURE_RPC=$enableval], [SECURE_RPC="try"]) ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +- if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then +- FOUND_SECURE_RPC="no" +- AC_CHECK_FUNCS([authdes_seccreate authdes_create], +- [FOUND_SECURE_RPC="yes"]) +- if test "x$FOUND_SECURE_RPC" = "xno" ; then +- if test "x$SECURE_RPC" = "xyes" ; then +- AC_MSG_ERROR([Secure RPC requested, but required functions not found]) +- fi +- SECURE_RPC="no" +- else +- dnl FreeBSD keeps getsecretkey in librpcsvc +- AC_SEARCH_LIBS(getsecretkey, [rpcsvc]) +- SECURE_RPC="yes" +- fi +- fi +- AC_MSG_CHECKING([if Secure RPC authentication ("SUN-DES-1") should be supported]) +- if test "x$SECURE_RPC" = "xyes" ; then +- AC_DEFINE(SECURE_RPC, 1, [Support Secure RPC ("SUN-DES-1") authentication for X11 clients]) +- fi +- AC_MSG_RESULT($SECURE_RPC) +-]) # XTRANS_SECURE_RPC_FLAGS ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir + ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + ++m4_include([m4/ac_define_dir.m4]) ++m4_include([m4/dolt.m4]) ++m4_include([m4/libtool.m4]) ++m4_include([m4/ltoptions.m4]) ++m4_include([m4/ltsugar.m4]) ++m4_include([m4/ltversion.m4]) ++m4_include([m4/lt~obsolete.m4]) +diff -Naur xorg-server-1.7.99.1/composite/Makefile.in xorg-server-1.7.99.1.patch/composite/Makefile.in +--- xorg-server-1.7.99.1/composite/Makefile.in 2009-10-21 18:07:08.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/composite/Makefile.in 2009-11-15 21:03:55.385356421 +0100 +@@ -257,7 +257,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -279,6 +278,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/config/config-backends.h xorg-server-1.7.99.1.patch/config/config-backends.h +--- xorg-server-1.7.99.1/config/config-backends.h 2008-11-14 22:27:05.000000000 +0100 ++++ xorg-server-1.7.99.1.patch/config/config-backends.h 2009-11-15 20:28:56.126390180 +0100 +@@ -27,7 +27,12 @@ + #include + #endif + +-#ifdef CONFIG_NEED_DBUS ++#ifdef CONFIG_UDEV ++int config_udev_init(void); ++void config_udev_fini(void); ++#else ++ ++# ifdef CONFIG_NEED_DBUS + #include + + typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, +@@ -46,14 +51,15 @@ + void config_dbus_core_fini(void); + int config_dbus_core_add_hook(struct config_dbus_core_hook *hook); + void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook); +-#endif ++# endif + +-#ifdef CONFIG_DBUS_API ++# ifdef CONFIG_DBUS_API + int config_dbus_init(void); + void config_dbus_fini(void); +-#endif ++# endif + +-#ifdef CONFIG_HAL ++# ifdef CONFIG_HAL + int config_hal_init(void); + void config_hal_fini(void); ++# endif + #endif +diff -Naur xorg-server-1.7.99.1/config/config.c xorg-server-1.7.99.1.patch/config/config.c +--- xorg-server-1.7.99.1/config/config.c 2009-10-13 19:04:27.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/config/config.c 2009-11-15 20:28:56.127233670 +0100 +@@ -34,7 +34,10 @@ + void + config_init(void) + { +-#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) ++#ifdef CONFIG_UDEV ++ if (!config_udev_init()) ++ ErrorF("[config] failed to initialise udev\n"); ++#elif defined(CONFIG_NEED_DBUS) + if (config_dbus_core_init()) { + # ifdef CONFIG_DBUS_API + if (!config_dbus_init()) +@@ -54,7 +57,9 @@ + void + config_fini(void) + { +-#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) ++#if defined(CONFIG_UDEV) ++ config_udev_fini(); ++#elif defined(CONFIG_NEED_DBUS) + # ifdef CONFIG_HAL + config_hal_fini(); + # endif +diff -Naur xorg-server-1.7.99.1/config/Makefile.am xorg-server-1.7.99.1.patch/config/Makefile.am +--- xorg-server-1.7.99.1/config/Makefile.am 2009-10-13 19:04:27.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/config/Makefile.am 2009-11-15 20:28:56.128233748 +0100 +@@ -3,20 +3,32 @@ + noinst_LTLIBRARIES = libconfig.la + libconfig_la_SOURCES = config.c config-backends.h + ++if CONFIG_UDEV ++ ++AM_CFLAGS += @UDEV_CFLAGS@ ++libconfig_la_SOURCES += udev.c ++libconfig_la_LIBADD = @UDEV_LIBS@ ++ ++else ++ + if CONFIG_NEED_DBUS + AM_CFLAGS += @DBUS_CFLAGS@ + libconfig_la_SOURCES += dbus-core.c +-endif ++libconfig_la_LIBADD = @DBUS_LIBS@ + + if CONFIG_DBUS_API + dbusconfigdir = $(sysconfdir)/dbus-1/system.d + dbusconfig_DATA = xorg-server.conf +- + libconfig_la_SOURCES += dbus.c + endif + + if CONFIG_HAL + libconfig_la_SOURCES += hal.c ++libconfig_la_LIBADD += @HAL_LIBS@ + endif + ++endif # CONFIG_NEED_DBUS ++ ++endif # !CONFIG_UDEV ++ + EXTRA_DIST = xorg-server.conf x11-input.fdi +diff -Naur xorg-server-1.7.99.1/config/Makefile.in xorg-server-1.7.99.1.patch/config/Makefile.in +--- xorg-server-1.7.99.1/config/Makefile.in 2009-10-21 18:07:08.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/config/Makefile.in 2009-11-15 21:03:55.553356076 +0100 +@@ -35,10 +35,13 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@CONFIG_NEED_DBUS_TRUE@am__append_1 = @DBUS_CFLAGS@ +-@CONFIG_NEED_DBUS_TRUE@am__append_2 = dbus-core.c +-@CONFIG_DBUS_API_TRUE@am__append_3 = dbus.c +-@CONFIG_HAL_TRUE@am__append_4 = hal.c ++@CONFIG_UDEV_TRUE@am__append_1 = @UDEV_CFLAGS@ ++@CONFIG_UDEV_TRUE@am__append_2 = udev.c ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_3 = @DBUS_CFLAGS@ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_4 = dbus-core.c ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_5 = dbus.c ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_6 = hal.c ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__append_7 = @HAL_LIBS@ + subdir = config + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -61,14 +64,18 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libconfig_la_LIBADD = +-am__libconfig_la_SOURCES_DIST = config.c config-backends.h dbus-core.c \ +- dbus.c hal.c +-@CONFIG_NEED_DBUS_TRUE@am__objects_1 = dbus-core.lo +-@CONFIG_DBUS_API_TRUE@am__objects_2 = dbus.lo +-@CONFIG_HAL_TRUE@am__objects_3 = hal.lo ++am__DEPENDENCIES_1 = ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@libconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++@CONFIG_UDEV_TRUE@libconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++am__libconfig_la_SOURCES_DIST = config.c config-backends.h udev.c \ ++ dbus-core.c dbus.c hal.c ++@CONFIG_UDEV_TRUE@am__objects_1 = udev.lo ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_2 = \ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ dbus-core.lo ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_3 = dbus.lo ++@CONFIG_HAL_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@am__objects_4 = hal.lo + am_libconfig_la_OBJECTS = config.lo $(am__objects_1) $(am__objects_2) \ +- $(am__objects_3) ++ $(am__objects_3) $(am__objects_4) + libconfig_la_OBJECTS = $(am_libconfig_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +@@ -264,7 +271,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -286,6 +292,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +@@ -409,12 +417,16 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CFLAGS = @DIX_CFLAGS@ $(am__append_1) ++AM_CFLAGS = @DIX_CFLAGS@ $(am__append_1) $(am__append_3) + noinst_LTLIBRARIES = libconfig.la + libconfig_la_SOURCES = config.c config-backends.h $(am__append_2) \ +- $(am__append_3) $(am__append_4) +-@CONFIG_DBUS_API_TRUE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d +-@CONFIG_DBUS_API_TRUE@dbusconfig_DATA = xorg-server.conf ++ $(am__append_4) $(am__append_5) $(am__append_6) ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@libconfig_la_LIBADD = \ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ @DBUS_LIBS@ \ ++@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ $(am__append_7) ++@CONFIG_UDEV_TRUE@libconfig_la_LIBADD = @UDEV_LIBS@ $(am__append_7) ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d ++@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfig_DATA = xorg-server.conf + EXTRA_DIST = xorg-server.conf x11-input.fdi + all: all-am + +@@ -472,6 +484,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-core.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hal.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udev.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -Naur xorg-server-1.7.99.1/config/udev.c xorg-server-1.7.99.1.patch/config/udev.c +--- xorg-server-1.7.99.1/config/udev.c 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.7.99.1.patch/config/udev.c 2009-11-15 20:28:56.130232157 +0100 +@@ -0,0 +1,283 @@ ++/* ++ * Copyright © 2009 Julien Cristau ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Julien Cristau ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define UDEV_PROP_KEY "x11_options." ++#define UDEV_XKB_PROP_KEY "xkb." ++ ++static void ++add_option(InputOption **options, const char *key, const char *value) ++{ ++ if (!value || *value == '\0') ++ return; ++ ++ for (; *options; options = &(*options)->next) ++ ; ++ *options = xcalloc(sizeof(**options), 1); ++ if (!*options) /* Yeesh. */ ++ return; ++ (*options)->key = xstrdup(key); ++ (*options)->value = xstrdup(value); ++ (*options)->next = NULL; ++} ++ ++static void ++device_added(struct udev_device *udev_device) ++{ ++ const char *path = NULL, *driver = NULL, *name = NULL; ++ char *config_info = NULL; ++ const char *syspath; ++ const char *key, *value, *tmp; ++ InputOption *options = NULL, *tmpo; ++ DeviceIntPtr dev = NULL; ++ struct udev_list_entry *set, *entry; ++ struct udev_device *parent; ++ int rc; ++ ++ driver = udev_device_get_property_value(udev_device, "x11_driver"); ++ ++ path = udev_device_get_devnode(udev_device); ++ ++ syspath = udev_device_get_syspath(udev_device); ++ ++ parent = udev_device_get_parent(udev_device); ++ if (parent) ++ name = udev_device_get_property_value(parent, "NAME"); ++ ++ if (!driver) ++ return; ++ if (!path) ++ return; ++ if (!syspath) ++ return; ++ options = xcalloc(sizeof(*options), 1); ++ if (!options) ++ return; ++ ++ options->key = xstrdup("_source"); ++ options->value = xstrdup("server/udev"); ++ if (!options->key || !options->value) ++ goto unwind; ++ ++ add_option(&options, "path", path); ++ add_option(&options, "device", path); ++ add_option(&options, "driver", driver); ++ ++ config_info = xalloc(strlen(syspath) + 6); /* "udev:" + \0 */ ++ if (!config_info) ++ goto unwind; ++ sprintf(config_info, "udev:%s", syspath); ++ ++ set = udev_device_get_properties_list_entry(udev_device); ++ udev_list_entry_foreach(entry, set) { ++ key = udev_list_entry_get_name(entry); ++ if (!key) ++ continue; ++ if (!strncasecmp(key, UDEV_PROP_KEY, sizeof(UDEV_PROP_KEY) - 1)) { ++ value = udev_list_entry_get_value(entry); ++ add_option(&options, key + sizeof(UDEV_PROP_KEY) - 1, value); ++ } else if (!strncasecmp(key, UDEV_XKB_PROP_KEY, sizeof(UDEV_XKB_PROP_KEY) - 1)) { ++ tmp = key + sizeof(UDEV_XKB_PROP_KEY) - 1; ++ value = udev_list_entry_get_value(entry); ++ if (!strcasecmp(tmp, "rules")) ++ add_option(&options, "xkb_rules", value); ++ else if (!strcasecmp(tmp, "layout")) ++ add_option(&options, "xkb_layout", value); ++ else if (!strcasecmp(tmp, "variant")) ++ add_option(&options, "xkb_variant", value); ++ else if (!strcasecmp(tmp, "model")) ++ add_option(&options, "xkb_model", value); ++ else if (!strcasecmp(tmp, "options")) ++ add_option(&options, "xkb_options", value); ++ } ++ } ++ add_option(&options, "name", name ? name : "(unnamed)"); ++ LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n", ++ name, path); ++ rc = NewInputDeviceRequest(options, &dev); ++ if (rc != Success) ++ goto unwind; ++ ++ for (; dev; dev = dev->next) { ++ xfree(dev->config_info); ++ dev->config_info = xstrdup(config_info); ++ } ++ ++ unwind: ++ xfree(config_info); ++ while (!dev && (tmpo = options)) { ++ options = tmpo->next; ++ xfree(tmpo->key); ++ xfree(tmpo->value); ++ xfree(tmpo); ++ } ++ ++ return; ++} ++ ++static void ++remove_device(DeviceIntPtr dev) ++{ ++ LogMessage(X_INFO, "config/udev: Removing input device %s\n", dev->name); ++ OsBlockSignals(); ++ ProcessInputEvents(); ++ DeleteInputDeviceRequest(dev); ++ OsReleaseSignals(); ++} ++ ++static void ++device_removed(struct udev_device *device) ++{ ++ DeviceIntPtr dev, next; ++ char *value; ++ const char *syspath = udev_device_get_syspath(device); ++ ++ value = xalloc(strlen(syspath) + 6); /* "udev:" + \0 */ ++ if (!value) ++ return; ++ sprintf(value, "udev:%s", syspath); ++ ++ for (dev = inputInfo.devices; dev; dev = next) { ++ next = dev->next; ++ if (dev->config_info && !strcmp(dev->config_info, value)) ++ remove_device(dev); ++ } ++ for (dev = inputInfo.off_devices; dev; dev = next) { ++ next = dev->next; ++ if (dev->config_info && !strcmp(dev->config_info, value)) ++ remove_device(dev); ++ } ++ ++ xfree(value); ++} ++ ++static void ++wakeup_handler(pointer data, int err, pointer read_mask) ++{ ++ struct udev_monitor *udev_monitor = data; ++ int udev_fd = udev_monitor_get_fd(udev_monitor); ++ struct udev_device *udev_device; ++ const char *action; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(udev_fd, (fd_set *)read_mask)) { ++ udev_device = udev_monitor_receive_device(udev_monitor); ++ if (!udev_device) ++ return; ++ action = udev_device_get_action(udev_device); ++ if (!action) ++ ; ++ else if (!strcmp(action, "add")) ++ device_added(udev_device); ++ else if (!strcmp(action, "remove")) ++ device_removed(udev_device); ++ else ++ ErrorF("config/udev: unhandled action %s\n", action); ++ udev_device_unref(udev_device); ++ } ++} ++ ++static void ++block_handler(pointer data, struct timeval **tv, pointer read_mask) ++{ ++} ++ ++static struct udev_monitor *udev_monitor; ++static OsTimerPtr udev_timer; ++ ++static CARD32 ++connect_timer(OsTimerPtr timer, CARD32 time, pointer arg) { ++ int fd; ++ struct udev_enumerate *enumerate; ++ struct udev_list_entry *devices, *device; ++ struct udev *udev = udev_monitor_get_udev(udev_monitor); ++ ++ fd = udev_monitor_get_fd(udev_monitor); ++ enumerate = udev_enumerate_new(udev); ++ udev_enumerate_add_match_subsystem(enumerate, "input"); ++ udev_enumerate_scan_devices(enumerate); ++ if (udev_monitor_enable_receiving(udev_monitor)) { ++ ErrorF("config/udev: failed to bind the udev monitor\n"); ++ goto unwind; ++ } ++ devices = udev_enumerate_get_list_entry(enumerate); ++ udev_list_entry_foreach(device, devices) { ++ const char *syspath = udev_list_entry_get_name(device); ++ struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath); ++ device_added(udev_device); ++ udev_device_unref(udev_device); ++ } ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor); ++ AddGeneralSocket(fd); ++ unwind: ++ udev_enumerate_unref(enumerate); ++ if (udev_timer) { ++ TimerFree(udev_timer); ++ udev_timer = NULL; ++ } ++ return 0; ++} ++ ++int ++config_udev_init(void) { ++ struct udev *udev; ++ ++ udev = udev_new(); ++ udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); ++ if (!udev_monitor) ++ return 0; ++ udev_timer = TimerSet(NULL, 0, 1, connect_timer, NULL); ++ if (!udev_timer) ++ return 0; ++ return 1; ++} ++ ++void ++config_udev_fini(void) ++{ ++ struct udev *udev = udev_monitor_get_udev(udev_monitor); ++ if (udev_timer) { ++ TimerFree(udev_timer); ++ udev_timer = NULL; ++ } ++ RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor)); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor); ++ udev_monitor_unref(udev_monitor); ++ udev_monitor = NULL; ++ udev_unref(udev); ++} +diff -Naur xorg-server-1.7.99.1/configure xorg-server-1.7.99.1.patch/configure +--- xorg-server-1.7.99.1/configure 2009-11-15 20:28:35.561356330 +0100 ++++ xorg-server-1.7.99.1.patch/configure 2009-11-15 21:03:49.864231133 +0100 +@@ -1065,6 +1065,10 @@ + 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 +@@ -1344,6 +1348,7 @@ + enable_dbe + enable_xf86bigfont + enable_dpms ++enable_config_udev + enable_config_dbus + enable_config_hal + enable_xfree86_utils +@@ -1384,6 +1389,8 @@ + PKG_CONFIG + YACC + YFLAGS ++UDEV_CFLAGS ++UDEV_LIBS + DBUS_CFLAGS + DBUS_LIBS + HAL_CFLAGS +@@ -2129,6 +2136,7 @@ + --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: auto) + --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) +@@ -2155,7 +2163,7 @@ + (default: auto) + --enable-unix-transport Enable UNIX domain socket transport + --enable-tcp-transport Enable TCP socket transport +- --enable-ipv6 Enable IPv6 support ++ --enable-IPv6 Enable IPv6 support + --enable-local-transport + Enable os-specific local transport + --enable-secure-rpc Enable Secure RPC +@@ -2239,6 +2247,8 @@ + 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 +@@ -5757,13 +5767,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:5760: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5770: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5763: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5773: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5766: output\"" >&5) ++ (eval echo "\"\$as_me:5776: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -6955,7 +6965,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6958 "configure"' > conftest.$ac_ext ++ echo '#line 6968 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8780,11 +8790,11 @@ + -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:8783: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8793: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8787: \$? = $ac_status" >&5 ++ echo "$as_me:8797: \$? = $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. +@@ -9119,11 +9129,11 @@ + -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:9122: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9132: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9126: \$? = $ac_status" >&5 ++ echo "$as_me:9136: \$? = $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. +@@ -9224,11 +9234,11 @@ + -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:9227: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9237: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9231: \$? = $ac_status" >&5 ++ echo "$as_me:9241: \$? = $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 +@@ -9279,11 +9289,11 @@ + -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:9282: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9292: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9286: \$? = $ac_status" >&5 ++ echo "$as_me:9296: \$? = $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 +@@ -12095,7 +12105,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12098 "configure" ++#line 12108 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12191,7 +12201,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12194 "configure" ++#line 12204 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -20492,6 +20502,13 @@ + 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=auto ++fi ++ + # Check whether --enable-config-dbus was given. + if test "${enable_config_dbus+set}" = set; then + enableval=$enable_config_dbus; CONFIG_DBUS_API=$enableval +@@ -20936,76 +20953,6 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5 +-$as_echo_n "checking for main in -lws2_32... " >&6; } +-if test "${ac_cv_lib_ws2_32_main+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lws2_32 $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +- +-int +-main () +-{ +-return main (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_ws2_32_main=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_ws2_32_main=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5 +-$as_echo "$ac_cv_lib_ws2_32_main" >&6; } +-if test "x$ac_cv_lib_ws2_32_main" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBWS2_32 1 +-_ACEOF +- +- LIBS="-lws2_32 $LIBS" +- +-fi +-ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main +- +- + # Needs to come after above checks for libsocket & libnsl for SVR4 systems + # Check whether --enable-ipv6 was given. + if test "${enable_ipv6+set}" = set; then +@@ -22079,16 +22026,115 @@ + LIBPCIACCESS="pciaccess >= 0.8.0" + LIBGLIB="glib-2.0 >= 2.16" + ++if test "x$CONFIG_UDEV" = xyes && ++ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then ++ { { $as_echo "$as_me:$LINENO: error: Hotplugging through both libudev and dbus/hal not allowed" >&5 ++$as_echo "$as_me: error: Hotplugging through both libudev and dbus/hal not allowed" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5 ++$as_echo_n "checking for UDEV... " >&6; } ++ ++if test -n "$UDEV_CFLAGS"; then ++ pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libudev >= 143") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 143" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$UDEV_LIBS"; then ++ pkg_cv_UDEV_LIBS="$UDEV_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libudev >= 143") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 143" 2>/dev/null` ++else ++ pkg_failed=yes ++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 --print-errors "libudev >= 143" 2>&1` ++ else ++ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev >= 143" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$UDEV_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$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:$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_echo "$as_me:$LINENO: error: udev configuration API requested, but libudev is not installed" >&5 ++$as_echo "$as_me: error: udev configuration API requested, but libudev is not installed" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_UDEV 1 ++_ACEOF ++ ++fi ++ + + pkg_failed=no + { $as_echo "$as_me:$LINENO: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DBUS_CFLAGS"; then +- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DBUS_CFLAGS"; then ++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 + ac_status=$? +@@ -22098,15 +22144,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DBUS_LIBS"; then +- pkg_cv_DBUS_LIBS="$DBUS_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DBUS_LIBS"; then ++ pkg_cv_DBUS_LIBS="$DBUS_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 + ac_status=$? +@@ -22116,9 +22160,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -22131,9 +22174,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1` + else +- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"` ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 +@@ -22197,11 +22240,10 @@ + { $as_echo "$as_me:$LINENO: checking for HAL" >&5 + $as_echo_n "checking for HAL... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$HAL_CFLAGS"; then +- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$HAL_CFLAGS"; then ++ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 + ($PKG_CONFIG --exists --print-errors "hal") 2>&5 + ac_status=$? +@@ -22211,15 +22253,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$HAL_LIBS"; then +- pkg_cv_HAL_LIBS="$HAL_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$HAL_LIBS"; then ++ pkg_cv_HAL_LIBS="$HAL_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5 + ($PKG_CONFIG --exists --print-errors "hal") 2>&5 + ac_status=$? +@@ -22229,9 +22269,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -22244,9 +22283,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1` + else +- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 +@@ -22278,7 +22317,6 @@ + #define CONFIG_HAL 1 + _ACEOF + +- REQUIRED_LIBS="$REQUIRED_LIBS hal" + CONFIG_NEED_DBUS="yes" + fi + if test "x$CONFIG_HAL" = xyes; then +@@ -22291,7 +22329,6 @@ + + + if test "x$CONFIG_NEED_DBUS" = xyes; then +- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" + + cat >>confdefs.h <<\_ACEOF + #define CONFIG_NEED_DBUS 1 +@@ -22776,11 +22813,10 @@ + { $as_echo "$as_me:$LINENO: checking for XLIB" >&5 + $as_echo_n "checking for XLIB... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XLIB_CFLAGS"; then +- pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XLIB_CFLAGS"; then ++ pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? +@@ -22790,15 +22826,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XLIB_LIBS"; then +- pkg_cv_XLIB_LIBS="$XLIB_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XLIB_LIBS"; then ++ pkg_cv_XLIB_LIBS="$XLIB_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? +@@ -22808,9 +22842,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -22823,9 +22856,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` ++ XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1` + else +- XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` ++ XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XLIB_PKG_ERRORS" >&5 +@@ -22889,11 +22922,10 @@ + { $as_echo "$as_me:$LINENO: checking for GL" >&5 + $as_echo_n "checking for GL... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GL_CFLAGS"; then +- pkg_cv_GL_CFLAGS="$GL_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GL_CFLAGS"; then ++ pkg_cv_GL_CFLAGS="$GL_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 + ac_status=$? +@@ -22903,15 +22935,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GL_LIBS"; then +- pkg_cv_GL_LIBS="$GL_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GL_LIBS"; then ++ pkg_cv_GL_LIBS="$GL_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\"") >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 + ac_status=$? +@@ -22921,9 +22951,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -22936,9 +22965,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` ++ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBGL" 2>&1` + else +- GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"` ++ GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBGL" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_PKG_ERRORS" >&5 +@@ -23060,11 +23089,10 @@ + { $as_echo "$as_me:$LINENO: checking for DRIPROTO" >&5 + $as_echo_n "checking for DRIPROTO... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRIPROTO_CFLAGS"; then +- pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRIPROTO_CFLAGS"; then ++ pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 + ac_status=$? +@@ -23074,15 +23102,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRIPROTO_LIBS"; then +- pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRIPROTO_LIBS"; then ++ pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5 + ac_status=$? +@@ -23092,9 +23118,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -23107,9 +23132,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"` ++ DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRIPROTO" 2>&1` + else +- DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"` ++ DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRIPROTO" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DRIPROTO_PKG_ERRORS" >&5 +@@ -23173,11 +23198,10 @@ + { $as_echo "$as_me:$LINENO: checking for DRI" >&5 + $as_echo_n "checking for DRI... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRI_CFLAGS"; then +- pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRI_CFLAGS"; then ++ pkg_cv_DRI_CFLAGS="$DRI_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 + ac_status=$? +@@ -23187,15 +23211,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRI_LIBS"; then +- pkg_cv_DRI_LIBS="$DRI_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRI_LIBS"; then ++ pkg_cv_DRI_LIBS="$DRI_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\"") >&5 + ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5 + ac_status=$? +@@ -23205,9 +23227,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -23220,9 +23241,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` ++ DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBDRI" 2>&1` + else +- DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"` ++ DRI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBDRI" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DRI_PKG_ERRORS" >&5 +@@ -23289,11 +23310,10 @@ + { $as_echo "$as_me:$LINENO: checking for DRI2PROTO" >&5 + $as_echo_n "checking for DRI2PROTO... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRI2PROTO_CFLAGS"; then +- pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRI2PROTO_CFLAGS"; then ++ pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 + ac_status=$? +@@ -23303,15 +23323,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DRI2PROTO_LIBS"; then +- pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DRI2PROTO_LIBS"; then ++ pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 + ac_status=$? +@@ -23321,9 +23339,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -23336,9 +23353,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"` ++ DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRI2PROTO" 2>&1` + else +- DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"` ++ DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRI2PROTO" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DRI2PROTO_PKG_ERRORS" >&5 +@@ -23385,11 +23402,10 @@ + { $as_echo "$as_me:$LINENO: checking for LIBDRM" >&5 + $as_echo_n "checking for LIBDRM... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$LIBDRM_CFLAGS"; then +- pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$LIBDRM_CFLAGS"; then ++ pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 + ac_status=$? +@@ -23399,15 +23415,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$LIBDRM_LIBS"; then +- pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$LIBDRM_LIBS"; then ++ pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 + ac_status=$? +@@ -23417,9 +23431,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -23432,9 +23445,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"` ++ LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDRM" 2>&1` + else +- LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"` ++ LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDRM" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBDRM_PKG_ERRORS" >&5 +@@ -24762,11 +24775,10 @@ + { $as_echo "$as_me:$LINENO: checking for XDMCP" >&5 + $as_echo_n "checking for XDMCP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XDMCP_CFLAGS"; then +- pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XDMCP_CFLAGS"; then ++ pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 + ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 + ac_status=$? +@@ -24776,15 +24788,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XDMCP_LIBS"; then +- pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XDMCP_LIBS"; then ++ pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 + ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 + ac_status=$? +@@ -24794,9 +24804,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -24809,9 +24818,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"` ++ XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1` + else +- XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` ++ XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XDMCP_PKG_ERRORS" >&5 +@@ -25136,11 +25145,10 @@ + { $as_echo "$as_me:$LINENO: checking for GLIB" >&5 + $as_echo_n "checking for GLIB... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 + ac_status=$? +@@ -25150,15 +25158,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GLIB_LIBS"; then +- pkg_cv_GLIB_LIBS="$GLIB_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5 + ac_status=$? +@@ -25168,9 +25174,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -25183,9 +25188,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBGLIB" 2>&1` + else +- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBGLIB" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 +@@ -25527,11 +25532,10 @@ + { $as_echo "$as_me:$LINENO: checking for XSERVERCFLAGS" >&5 + $as_echo_n "checking for XSERVERCFLAGS... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XSERVERCFLAGS_CFLAGS"; then +- pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XSERVERCFLAGS_CFLAGS"; then ++ pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 + ac_status=$? +@@ -25541,15 +25545,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XSERVERCFLAGS_LIBS"; then +- pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XSERVERCFLAGS_LIBS"; then ++ pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 + ac_status=$? +@@ -25559,9 +25561,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -25574,9 +25575,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` ++ XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1` + else +- XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` ++ XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 +@@ -25640,11 +25641,10 @@ + { $as_echo "$as_me:$LINENO: checking for XSERVERLIBS" >&5 + $as_echo_n "checking for XSERVERLIBS... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XSERVERLIBS_CFLAGS"; then +- pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XSERVERLIBS_CFLAGS"; then ++ pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 + ac_status=$? +@@ -25654,15 +25654,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XSERVERLIBS_LIBS"; then +- pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XSERVERLIBS_LIBS"; then ++ pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 + ac_status=$? +@@ -25672,9 +25670,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -25687,9 +25684,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"` ++ XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_LIBS" 2>&1` + else +- XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` ++ XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_LIBS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XSERVERLIBS_PKG_ERRORS" >&5 +@@ -25849,11 +25846,10 @@ + { $as_echo "$as_me:$LINENO: checking for XNESTMODULES" >&5 + $as_echo_n "checking for XNESTMODULES... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XNESTMODULES_CFLAGS"; then +- pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XNESTMODULES_CFLAGS"; then ++ pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 + ac_status=$? +@@ -25863,15 +25859,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XNESTMODULES_LIBS"; then +- pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XNESTMODULES_LIBS"; then ++ pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 + ac_status=$? +@@ -25881,9 +25875,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -25896,9 +25889,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` ++ XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1` + else +- XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"` ++ XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XNESTMODULES_PKG_ERRORS" >&5 +@@ -26107,11 +26100,10 @@ + { $as_echo "$as_me:$LINENO: checking for PCIACCESS" >&5 + $as_echo_n "checking for PCIACCESS... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$PCIACCESS_CFLAGS"; then +- pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PCIACCESS_CFLAGS"; then ++ pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 + ac_status=$? +@@ -26121,15 +26113,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$PCIACCESS_LIBS"; then +- pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PCIACCESS_LIBS"; then ++ pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 + ac_status=$? +@@ -26139,9 +26129,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -26154,9 +26143,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"` ++ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBPCIACCESS" 2>&1` + else +- PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"` ++ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBPCIACCESS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PCIACCESS_PKG_ERRORS" >&5 +@@ -27184,11 +27173,10 @@ + { $as_echo "$as_me:$LINENO: checking for DGA" >&5 + $as_echo_n "checking for DGA... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DGA_CFLAGS"; then +- pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DGA_CFLAGS"; then ++ pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 + ac_status=$? +@@ -27198,15 +27186,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DGA_LIBS"; then +- pkg_cv_DGA_LIBS="$DGA_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DGA_LIBS"; then ++ pkg_cv_DGA_LIBS="$DGA_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 + ac_status=$? +@@ -27216,9 +27202,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -27231,9 +27216,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"` ++ DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1` + else +- DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"` ++ DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DGA_PKG_ERRORS" >&5 +@@ -27258,11 +27243,10 @@ + { $as_echo "$as_me:$LINENO: checking for DGA" >&5 + $as_echo_n "checking for DGA... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DGA_CFLAGS"; then +- pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DGA_CFLAGS"; then ++ pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 + ac_status=$? +@@ -27272,15 +27256,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DGA_LIBS"; then +- pkg_cv_DGA_LIBS="$DGA_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DGA_LIBS"; then ++ pkg_cv_DGA_LIBS="$DGA_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 + ac_status=$? +@@ -27290,9 +27272,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -27305,9 +27286,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"` ++ DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1` + else +- DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"` ++ DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DGA_PKG_ERRORS" >&5 +@@ -27384,11 +27365,10 @@ + { $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 + $as_echo_n "checking for XF86VIDMODE... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XF86VIDMODE_CFLAGS"; then +- pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XF86VIDMODE_CFLAGS"; then ++ pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 + ac_status=$? +@@ -27398,15 +27378,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XF86VIDMODE_LIBS"; then +- pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XF86VIDMODE_LIBS"; then ++ pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 + ac_status=$? +@@ -27416,9 +27394,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -27431,9 +27408,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"` ++ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1` + else +- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"` ++ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XF86VIDMODE_PKG_ERRORS" >&5 +@@ -27458,11 +27435,10 @@ + { $as_echo "$as_me:$LINENO: checking for XF86VIDMODE" >&5 + $as_echo_n "checking for XF86VIDMODE... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XF86VIDMODE_CFLAGS"; then +- pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XF86VIDMODE_CFLAGS"; then ++ pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 + ac_status=$? +@@ -27472,15 +27448,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XF86VIDMODE_LIBS"; then +- pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XF86VIDMODE_LIBS"; then ++ pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\"") >&5 + ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 + ac_status=$? +@@ -27490,9 +27464,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -27505,9 +27478,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"` ++ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1` + else +- XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"` ++ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XF86VIDMODE_PKG_ERRORS" >&5 +@@ -27579,11 +27552,10 @@ + { $as_echo "$as_me:$LINENO: checking for XORG_MODULES" >&5 + $as_echo_n "checking for XORG_MODULES... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XORG_MODULES_CFLAGS"; then +- pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XORG_MODULES_CFLAGS"; then ++ pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 + ac_status=$? +@@ -27593,15 +27565,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XORG_MODULES_LIBS"; then +- pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XORG_MODULES_LIBS"; then ++ pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 + ac_status=$? +@@ -27611,9 +27581,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -27626,9 +27595,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XORG_MODULES"` ++ XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XORG_MODULES" 2>&1` + else +- XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XORG_MODULES"` ++ XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XORG_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XORG_MODULES_PKG_ERRORS" >&5 +@@ -28133,11 +28102,10 @@ + { $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 + $as_echo_n "checking for XWINMODULES... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XWINMODULES_CFLAGS"; then +- pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XWINMODULES_CFLAGS"; then ++ pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 + ac_status=$? +@@ -28147,15 +28115,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XWINMODULES_LIBS"; then +- pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XWINMODULES_LIBS"; then ++ pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 + ac_status=$? +@@ -28165,9 +28131,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -28180,9 +28145,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` ++ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1` + else +- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` ++ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XWINMODULES_PKG_ERRORS" >&5 +@@ -28265,11 +28230,10 @@ + { $as_echo "$as_me:$LINENO: checking for XWINMODULES" >&5 + $as_echo_n "checking for XWINMODULES... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XWINMODULES_CFLAGS"; then +- pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XWINMODULES_CFLAGS"; then ++ pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 + ac_status=$? +@@ -28279,15 +28243,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XWINMODULES_LIBS"; then +- pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XWINMODULES_LIBS"; then ++ pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 + ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 + ac_status=$? +@@ -28297,9 +28259,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -28312,9 +28273,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` ++ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1` + else +- XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` ++ XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XWINMODULES_PKG_ERRORS" >&5 +@@ -28596,11 +28557,10 @@ + { $as_echo "$as_me:$LINENO: checking for XPBPROXY" >&5 + $as_echo_n "checking for XPBPROXY... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XPBPROXY_CFLAGS"; then +- pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XPBPROXY_CFLAGS"; then ++ pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 + ac_status=$? +@@ -28610,15 +28570,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XPBPROXY_LIBS"; then +- pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XPBPROXY_LIBS"; then ++ pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 + ac_status=$? +@@ -28628,9 +28586,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -28643,9 +28600,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"` ++ XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1` + else +- XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"` ++ XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XPBPROXY_PKG_ERRORS" >&5 +@@ -28889,11 +28846,10 @@ + { $as_echo "$as_me:$LINENO: checking for DMXMODULES" >&5 + $as_echo_n "checking for DMXMODULES... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXMODULES_CFLAGS"; then +- pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXMODULES_CFLAGS"; then ++ pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 + ac_status=$? +@@ -28903,15 +28859,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXMODULES_LIBS"; then +- pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXMODULES_LIBS"; then ++ pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5 + ac_status=$? +@@ -28921,9 +28875,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -28936,9 +28889,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"` ++ DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1` + else +- DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"` ++ DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DMXMODULES_PKG_ERRORS" >&5 +@@ -29276,11 +29229,10 @@ + { $as_echo "$as_me:$LINENO: checking for XDMXCONFIG_DEP" >&5 + $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XDMXCONFIG_DEP_CFLAGS"; then +- pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XDMXCONFIG_DEP_CFLAGS"; then ++ pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 + ac_status=$? +@@ -29290,15 +29242,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XDMXCONFIG_DEP_LIBS"; then +- pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XDMXCONFIG_DEP_LIBS"; then ++ pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 + ac_status=$? +@@ -29308,9 +29258,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -29323,9 +29272,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` ++ XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xaw7 xmu xt xpm x11" 2>&1` + else +- XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` ++ XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xaw7 xmu xt xpm x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5 +@@ -29391,11 +29340,10 @@ + { $as_echo "$as_me:$LINENO: checking for DMXEXAMPLES_DEP" >&5 + $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then +- pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then ++ pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29405,15 +29353,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXEXAMPLES_DEP_LIBS"; then +- pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXEXAMPLES_DEP_LIBS"; then ++ pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29423,9 +29369,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -29438,9 +29383,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"` ++ DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` + else +- DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"` ++ DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5 +@@ -29505,11 +29450,10 @@ + { $as_echo "$as_me:$LINENO: checking for DMXXMUEXAMPLES_DEP" >&5 + $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then +- pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then ++ pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29519,15 +29463,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then +- pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then ++ pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29537,9 +29479,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -29552,9 +29493,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"` ++ DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` + else +- DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"` ++ DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5 +@@ -29619,11 +29560,10 @@ + { $as_echo "$as_me:$LINENO: checking for DMXXIEXAMPLES_DEP" >&5 + $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then +- pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then ++ pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29633,15 +29573,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then +- pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then ++ pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29651,9 +29589,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -29666,9 +29603,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"` ++ DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` + else +- DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"` ++ DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5 +@@ -29733,11 +29670,10 @@ + { $as_echo "$as_me:$LINENO: checking for XTSTEXAMPLES_DEP" >&5 + $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then +- pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then ++ pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29747,15 +29683,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XTSTEXAMPLES_DEP_LIBS"; then +- pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XTSTEXAMPLES_DEP_LIBS"; then ++ pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29765,9 +29699,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -29780,9 +29713,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"` ++ XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` + else +- XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"` ++ XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5 +@@ -29847,11 +29780,10 @@ + { $as_echo "$as_me:$LINENO: checking for XRESEXAMPLES_DEP" >&5 + $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then +- pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then ++ pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29861,15 +29793,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XRESEXAMPLES_DEP_LIBS"; then +- pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XRESEXAMPLES_DEP_LIBS"; then ++ pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29879,9 +29809,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -29894,9 +29823,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres $LIBXEXT x11"` ++ XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xres $LIBXEXT x11" 2>&1` + else +- XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres $LIBXEXT x11"` ++ XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xres $LIBXEXT x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5 +@@ -29961,11 +29890,10 @@ + { $as_echo "$as_me:$LINENO: checking for X11EXAMPLES_DEP" >&5 + $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$X11EXAMPLES_DEP_CFLAGS"; then +- pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$X11EXAMPLES_DEP_CFLAGS"; then ++ pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29975,15 +29903,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$X11EXAMPLES_DEP_LIBS"; then +- pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$X11EXAMPLES_DEP_LIBS"; then ++ pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5 + ac_status=$? +@@ -29993,9 +29919,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -30008,9 +29933,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXEXT x11"` ++ X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXEXT x11" 2>&1` + else +- X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXEXT x11"` ++ X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXEXT x11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5 +@@ -30502,11 +30427,10 @@ + { $as_echo "$as_me:$LINENO: checking for TSLIB" >&5 + $as_echo_n "checking for TSLIB... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$TSLIB_CFLAGS"; then +- pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$TSLIB_CFLAGS"; then ++ pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 + ac_status=$? +@@ -30516,15 +30440,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$TSLIB_LIBS"; then +- pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$TSLIB_LIBS"; then ++ pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 + ac_status=$? +@@ -30534,9 +30456,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -30549,9 +30470,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"` ++ TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1` + else +- TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"` ++ TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$TSLIB_PKG_ERRORS" >&5 +@@ -30671,11 +30592,10 @@ + { $as_echo "$as_me:$LINENO: checking for XEPHYR" >&5 + $as_echo_n "checking for XEPHYR... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$XEPHYR_CFLAGS"; then +- pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XEPHYR_CFLAGS"; then ++ pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 + ac_status=$? +@@ -30685,15 +30605,13 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$XEPHYR_LIBS"; then +- pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$XEPHYR_LIBS"; then ++ pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\"") >&5 + ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 + ac_status=$? +@@ -30703,9 +30621,8 @@ + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -30718,9 +30635,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"` ++ XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1` + else +- XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"` ++ XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XEPHYR_PKG_ERRORS" >&5 +@@ -31378,6 +31295,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${CONFIG_UDEV_TRUE}" && test -z "${CONFIG_UDEV_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"CONFIG_UDEV\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"CONFIG_UDEV\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configure.ac +--- xorg-server-1.7.99.1/configure.ac 2009-11-15 20:28:35.563356346 +0100 ++++ xorg-server-1.7.99.1.patch/configure.ac 2009-11-15 20:28:56.137232562 +0100 +@@ -597,6 +597,7 @@ + AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) + AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) ++AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) + AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no]) + AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) +@@ -755,6 +756,25 @@ + LIBPCIACCESS="pciaccess >= 0.8.0" + LIBGLIB="glib-2.0 >= 2.16" + ++if test "x$CONFIG_UDEV" = xyes && ++ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then ++ AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed]) ++fi ++ ++PKG_CHECK_MODULES(UDEV, libudev >= 143, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) ++if test "x$CONFIG_UDEV" = xauto; then ++ CONFIG_UDEV="$HAVE_LIBUDEV" ++fi ++AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes]) ++if test "x$CONFIG_UDEV" = xyes; then ++ CONFIG_DBUS_API=no ++ CONFIG_HAL=no ++ if ! test "x$HAVE_LIBUDEV" = xyes; then ++ AC_MSG_ERROR([udev configuration API requested, but libudev is not installed]) ++ fi ++ AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug]) ++fi ++ + dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas + dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config + dnl API. +@@ -787,13 +807,11 @@ + fi + + AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) +- REQUIRED_LIBS="$REQUIRED_LIBS hal" + CONFIG_NEED_DBUS="yes" + fi + AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes]) + + if test "x$CONFIG_NEED_DBUS" = xyes; then +- REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" + AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug]) + fi + AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes]) +diff -Naur xorg-server-1.7.99.1/damageext/Makefile.in xorg-server-1.7.99.1.patch/damageext/Makefile.in +--- xorg-server-1.7.99.1/damageext/Makefile.in 2009-10-21 18:07:08.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/damageext/Makefile.in 2009-11-15 21:03:55.700356175 +0100 +@@ -230,7 +230,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -252,6 +251,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/dbe/Makefile.in xorg-server-1.7.99.1.patch/dbe/Makefile.in +--- xorg-server-1.7.99.1/dbe/Makefile.in 2009-10-21 18:07:08.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/dbe/Makefile.in 2009-11-15 21:03:55.860356178 +0100 +@@ -256,7 +256,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -278,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/dix/Makefile.in xorg-server-1.7.99.1.patch/dix/Makefile.in +--- xorg-server-1.7.99.1/dix/Makefile.in 2009-10-21 18:07:09.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/dix/Makefile.in 2009-11-15 21:03:56.052356602 +0100 +@@ -270,7 +270,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -292,6 +291,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/doc/Makefile.in xorg-server-1.7.99.1.patch/doc/Makefile.in +--- xorg-server-1.7.99.1/doc/Makefile.in 2009-10-21 18:07:09.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/doc/Makefile.in 2009-11-15 21:03:56.192356360 +0100 +@@ -233,7 +233,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -255,6 +254,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/exa/Makefile.in xorg-server-1.7.99.1.patch/exa/Makefile.in +--- xorg-server-1.7.99.1/exa/Makefile.in 2009-10-21 18:07:09.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/exa/Makefile.in 2009-11-15 21:03:56.350356206 +0100 +@@ -258,7 +258,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -283,6 +282,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/fb/Makefile.in xorg-server-1.7.99.1.patch/fb/Makefile.in +--- xorg-server-1.7.99.1/fb/Makefile.in 2009-10-21 18:07:09.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/fb/Makefile.in 2009-11-15 21:03:56.847356366 +0100 +@@ -286,7 +286,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -308,6 +307,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/glx/Makefile.in xorg-server-1.7.99.1.patch/glx/Makefile.in +--- xorg-server-1.7.99.1/glx/Makefile.in 2009-10-21 18:07:10.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/glx/Makefile.in 2009-11-15 21:03:57.035356475 +0100 +@@ -249,7 +249,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -271,6 +270,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/dmx/config/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/config/Makefile.in +--- xorg-server-1.7.99.1/hw/dmx/config/Makefile.in 2009-10-21 18:07:10.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/dmx/config/Makefile.in 2009-11-15 21:03:57.603356138 +0100 +@@ -292,7 +292,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -314,6 +313,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/dmx/doc/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/doc/Makefile.in +--- xorg-server-1.7.99.1/hw/dmx/doc/Makefile.in 2009-10-21 18:07:10.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/dmx/doc/Makefile.in 2009-11-15 21:03:57.747356351 +0100 +@@ -227,7 +227,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -249,6 +248,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/dmx/examples/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/examples/Makefile.in +--- xorg-server-1.7.99.1/hw/dmx/examples/Makefile.in 2009-10-21 18:07:11.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/dmx/examples/Makefile.in 2009-11-15 21:03:58.062356105 +0100 +@@ -334,7 +334,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -356,6 +355,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/dmx/glxProxy/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/glxProxy/Makefile.in +--- xorg-server-1.7.99.1/hw/dmx/glxProxy/Makefile.in 2009-10-21 18:07:11.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/dmx/glxProxy/Makefile.in 2009-11-15 21:03:58.218355235 +0100 +@@ -241,7 +241,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -263,6 +262,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/dmx/input/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/input/Makefile.in +--- xorg-server-1.7.99.1/hw/dmx/input/Makefile.in 2009-10-21 18:07:11.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/dmx/input/Makefile.in 2009-11-15 21:03:58.407356749 +0100 +@@ -255,7 +255,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -277,6 +276,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/dmx/Makefile.in xorg-server-1.7.99.1.patch/hw/dmx/Makefile.in +--- xorg-server-1.7.99.1/hw/dmx/Makefile.in 2009-10-21 18:07:10.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/dmx/Makefile.in 2009-11-15 21:03:57.369356115 +0100 +@@ -319,7 +319,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -341,6 +340,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/kdrive/ephyr/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/ephyr/Makefile.in +--- xorg-server-1.7.99.1/hw/kdrive/ephyr/Makefile.in 2009-10-21 18:07:11.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/kdrive/ephyr/Makefile.in 2009-11-15 21:03:58.727355778 +0100 +@@ -293,7 +293,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -315,6 +314,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/kdrive/fake/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/fake/Makefile.in +--- xorg-server-1.7.99.1/hw/kdrive/fake/Makefile.in 2009-10-21 18:07:11.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/kdrive/fake/Makefile.in 2009-11-15 21:03:58.890356018 +0100 +@@ -239,7 +239,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -261,6 +260,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/kdrive/fbdev/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/fbdev/Makefile.in +--- xorg-server-1.7.99.1/hw/kdrive/fbdev/Makefile.in 2009-10-21 18:07:12.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/kdrive/fbdev/Makefile.in 2009-11-15 21:03:59.070231178 +0100 +@@ -240,7 +240,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -262,6 +261,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/kdrive/linux/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/linux/Makefile.in +--- xorg-server-1.7.99.1/hw/kdrive/linux/Makefile.in 2009-10-21 18:07:12.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/kdrive/linux/Makefile.in 2009-11-15 21:03:59.224231478 +0100 +@@ -235,7 +235,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -257,6 +256,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/kdrive/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/Makefile.in +--- xorg-server-1.7.99.1/hw/kdrive/Makefile.in 2009-10-21 18:07:11.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/kdrive/Makefile.in 2009-11-15 21:03:58.541355617 +0100 +@@ -243,7 +243,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -265,6 +264,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/kdrive/src/Makefile.in xorg-server-1.7.99.1.patch/hw/kdrive/src/Makefile.in +--- xorg-server-1.7.99.1/hw/kdrive/src/Makefile.in 2009-10-21 18:07:12.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/kdrive/src/Makefile.in 2009-11-15 21:03:59.393231420 +0100 +@@ -240,7 +240,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -262,6 +261,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/Makefile.in xorg-server-1.7.99.1.patch/hw/Makefile.in +--- xorg-server-1.7.99.1/hw/Makefile.in 2009-10-21 18:07:10.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/Makefile.in 2009-11-15 21:03:57.172356486 +0100 +@@ -243,7 +243,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -265,6 +264,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/vfb/Makefile.in xorg-server-1.7.99.1.patch/hw/vfb/Makefile.in +--- xorg-server-1.7.99.1/hw/vfb/Makefile.in 2009-10-21 18:07:12.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/vfb/Makefile.in 2009-11-15 21:03:59.593231285 +0100 +@@ -277,7 +277,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -299,6 +298,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/common/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/common/Makefile.in 2009-10-21 18:07:13.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/common/Makefile.in 2009-11-15 21:03:59.953231643 +0100 +@@ -282,7 +282,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -304,6 +303,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/xf86Config.c xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Config.c +--- xorg-server-1.7.99.1/hw/xfree86/common/xf86Config.c 2009-10-13 19:04:27.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Config.c 2009-11-15 20:28:56.144233245 +0100 +@@ -1457,6 +1457,10 @@ + xf86Msg(X_INFO, "The server relies on HAL to provide the list of " + "input devices.\n\tIf no devices become available, " + "reconfigure HAL or disable AllowEmptyInput.\n"); ++#elif CONFIG_UDEV ++ xf86Msg(X_INFO, "The server relies on udev to provide the list of " ++ "input devices.\n\tIf no devices become available, " ++ "reconfigure udev or disable AllowEmptyInput.\n"); + #else + xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" + "\tTry disabling AllowEmptyInput.\n"); +diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/xf86Globals.c xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Globals.c +--- xorg-server-1.7.99.1/hw/xfree86/common/xf86Globals.c 2009-10-13 19:04:27.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86Globals.c 2009-11-15 20:28:56.189232342 +0100 +@@ -132,7 +132,7 @@ + .kbdCustomKeycodes = FALSE, + .disableRandR = FALSE, + .randRFrom = X_DEFAULT, +-#ifdef CONFIG_HAL ++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) + .allowEmptyInput = TRUE, + .autoAddDevices = TRUE, + .autoEnableDevices = TRUE +diff -Naur xorg-server-1.7.99.1/hw/xfree86/ddc/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/ddc/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/ddc/Makefile.in 2009-10-21 18:07:13.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/ddc/Makefile.in 2009-11-15 21:04:00.137231087 +0100 +@@ -256,7 +256,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -278,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/dixmods/extmod/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/extmod/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/dixmods/extmod/Makefile.in 2009-10-21 18:07:13.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/extmod/Makefile.in 2009-11-15 21:04:00.547230975 +0100 +@@ -264,7 +264,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -286,6 +285,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/dixmods/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/dixmods/Makefile.in 2009-10-21 18:07:13.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/dixmods/Makefile.in 2009-11-15 21:04:00.375231983 +0100 +@@ -344,7 +344,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -366,6 +365,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/devel/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/devel/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/doc/devel/Makefile.in 2009-10-21 18:07:13.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/devel/Makefile.in 2009-11-15 21:04:00.819231888 +0100 +@@ -207,7 +207,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -229,6 +228,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/doc/Makefile.in 2009-10-21 18:07:13.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/Makefile.in 2009-11-15 21:04:00.688231650 +0100 +@@ -244,7 +244,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -266,6 +265,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/man/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/man/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/doc/man/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/man/Makefile.in 2009-11-15 21:04:00.989231281 +0100 +@@ -233,7 +233,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -255,6 +254,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/doc/sgml/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/doc/sgml/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/doc/sgml/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/doc/sgml/Makefile.in 2009-11-15 21:04:01.143230952 +0100 +@@ -227,7 +227,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -249,6 +248,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/dri/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dri/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/dri/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/dri/Makefile.in 2009-11-15 21:04:01.331231690 +0100 +@@ -259,7 +259,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -281,6 +280,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/dri2/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/dri2/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/dri2/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/dri2/Makefile.in 2009-11-15 21:04:01.510231651 +0100 +@@ -258,7 +258,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -280,6 +279,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/exa/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/exa/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/exa/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/exa/Makefile.in 2009-11-15 21:04:01.685230667 +0100 +@@ -262,7 +262,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -284,6 +283,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/fbdevhw/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/fbdevhw/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/fbdevhw/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/fbdevhw/Makefile.in 2009-11-15 21:04:01.864231117 +0100 +@@ -267,7 +267,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -289,6 +288,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/i2c/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/i2c/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/i2c/Makefile.in 2009-10-21 18:07:14.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/i2c/Makefile.in 2009-11-15 21:04:02.088230843 +0100 +@@ -308,7 +308,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -330,6 +329,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/int10/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/int10/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/int10/Makefile.in 2009-10-21 18:07:15.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/int10/Makefile.in 2009-11-15 21:04:02.283231362 +0100 +@@ -272,7 +272,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -294,6 +293,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/loader/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/loader/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/loader/Makefile.in 2009-10-21 18:07:15.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/loader/Makefile.in 2009-11-15 21:04:02.445231034 +0100 +@@ -231,7 +231,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -253,6 +252,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/Makefile.in 2009-10-21 18:07:12.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/Makefile.in 2009-11-15 21:03:59.774231612 +0100 +@@ -290,7 +290,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -312,6 +311,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/modes/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/modes/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/modes/Makefile.in 2009-10-21 18:07:15.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/modes/Makefile.in 2009-11-15 21:04:02.616230644 +0100 +@@ -262,7 +262,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -284,6 +283,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/bsd/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bsd/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/bsd/Makefile.in 2009-10-21 18:07:15.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bsd/Makefile.in 2009-11-15 21:04:03.064231283 +0100 +@@ -256,7 +256,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -278,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/bus/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bus/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/bus/Makefile.in 2009-10-21 18:07:15.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/bus/Makefile.in 2009-11-15 21:04:03.243231523 +0100 +@@ -264,7 +264,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -286,6 +285,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/hurd/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/hurd/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/hurd/Makefile.in 2009-10-21 18:07:16.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/hurd/Makefile.in 2009-11-15 21:04:03.693356359 +0100 +@@ -232,7 +232,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -254,6 +253,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/linux/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/linux/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/linux/Makefile.in 2009-10-21 18:07:16.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/linux/Makefile.in 2009-11-15 21:04:04.089356054 +0100 +@@ -257,7 +257,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -279,6 +278,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/Makefile.in 2009-10-21 18:07:15.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/Makefile.in 2009-11-15 21:04:02.785230657 +0100 +@@ -293,7 +293,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -315,6 +314,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/misc/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/misc/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/misc/Makefile.in 2009-10-21 18:07:16.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/misc/Makefile.in 2009-11-15 21:04:04.250356135 +0100 +@@ -230,7 +230,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -252,6 +251,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/sco/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sco/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/sco/Makefile.in 2009-10-21 18:07:16.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sco/Makefile.in 2009-11-15 21:04:04.383356042 +0100 +@@ -204,7 +204,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -226,6 +225,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/solaris/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/solaris/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/solaris/Makefile.in 2009-10-21 18:07:17.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/solaris/Makefile.in 2009-11-15 21:04:04.613356589 +0100 +@@ -279,7 +279,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -301,6 +300,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/os-support/sysv/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sysv/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/os-support/sysv/Makefile.in 2009-10-21 18:07:17.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/os-support/sysv/Makefile.in 2009-11-15 21:04:04.749356592 +0100 +@@ -204,7 +204,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -226,6 +225,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/parser/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/parser/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/parser/Makefile.in 2009-10-21 18:07:17.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/parser/Makefile.in 2009-11-15 21:04:05.064356555 +0100 +@@ -287,7 +287,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -309,6 +308,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/ramdac/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/ramdac/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/ramdac/Makefile.in 2009-10-21 18:07:17.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/ramdac/Makefile.in 2009-11-15 21:04:05.239356550 +0100 +@@ -256,7 +256,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -278,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/shadowfb/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/shadowfb/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/shadowfb/Makefile.in 2009-10-21 18:07:17.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/shadowfb/Makefile.in 2009-11-15 21:04:05.406356196 +0100 +@@ -259,7 +259,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -281,6 +280,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/utils/cvt/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/utils/cvt/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/utils/cvt/Makefile.in 2009-10-21 18:07:18.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/utils/cvt/Makefile.in 2009-11-15 21:04:05.737356509 +0100 +@@ -292,7 +292,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -314,6 +313,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/utils/gtf/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/utils/gtf/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/utils/gtf/Makefile.in 2009-10-21 18:07:18.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/utils/gtf/Makefile.in 2009-11-15 21:04:05.921356164 +0100 +@@ -291,7 +291,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -313,6 +312,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/utils/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/utils/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/utils/Makefile.in 2009-10-21 18:07:18.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/utils/Makefile.in 2009-11-15 21:04:05.547356662 +0100 +@@ -244,7 +244,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -266,6 +265,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/vbe/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/vbe/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/vbe/Makefile.in 2009-10-21 18:07:18.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/vbe/Makefile.in 2009-11-15 21:04:06.113356587 +0100 +@@ -258,7 +258,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -280,6 +279,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/vgahw/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/vgahw/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/vgahw/Makefile.in 2009-10-21 18:07:18.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/vgahw/Makefile.in 2009-11-15 21:04:06.285356346 +0100 +@@ -258,7 +258,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -280,6 +279,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/x86emu/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/x86emu/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/x86emu/Makefile.in 2009-10-21 18:07:19.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/x86emu/Makefile.in 2009-11-15 21:04:06.449356245 +0100 +@@ -231,7 +231,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -253,6 +252,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/xaa/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/xaa/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/xaa/Makefile.in 2009-10-21 18:07:19.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/xaa/Makefile.in 2009-11-15 21:04:06.644356834 +0100 +@@ -278,7 +278,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -300,6 +299,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/xf8_16bpp/Makefile.in xorg-server-1.7.99.1.patch/hw/xfree86/xf8_16bpp/Makefile.in +--- xorg-server-1.7.99.1/hw/xfree86/xf8_16bpp/Makefile.in 2009-10-21 18:07:19.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/xf8_16bpp/Makefile.in 2009-11-15 21:04:06.822356436 +0100 +@@ -259,7 +259,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -281,6 +280,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xnest/Makefile.in xorg-server-1.7.99.1.patch/hw/xnest/Makefile.in +--- xorg-server-1.7.99.1/hw/xnest/Makefile.in 2009-10-21 18:07:19.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xnest/Makefile.in 2009-11-15 21:04:07.061356154 +0100 +@@ -280,7 +280,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -302,6 +301,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/bundle/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/bundle/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/bundle/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/bundle/Makefile.in 2009-11-15 21:04:07.568356191 +0100 +@@ -237,7 +237,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -259,6 +258,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/doc/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/doc/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/doc/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/doc/Makefile.in 2009-11-15 21:04:07.711356395 +0100 +@@ -233,7 +233,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -255,6 +254,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/GL/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/GL/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/GL/Makefile.in 2009-10-21 18:07:19.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/GL/Makefile.in 2009-11-15 21:04:07.226356340 +0100 +@@ -231,7 +231,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -253,6 +252,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/mach-startup/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/mach-startup/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/mach-startup/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/mach-startup/Makefile.in 2009-11-15 21:04:07.892356024 +0100 +@@ -268,7 +268,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -290,6 +289,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/Makefile.in 2009-10-21 18:07:19.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/Makefile.in 2009-11-15 21:04:07.419356564 +0100 +@@ -284,7 +284,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -306,6 +305,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/pbproxy/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/pbproxy/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/pbproxy/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/pbproxy/Makefile.in 2009-11-15 21:04:08.096355434 +0100 +@@ -255,7 +255,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -277,6 +276,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xquartz/xpr/Makefile.in xorg-server-1.7.99.1.patch/hw/xquartz/xpr/Makefile.in +--- xorg-server-1.7.99.1/hw/xquartz/xpr/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xquartz/xpr/Makefile.in 2009-11-15 21:04:08.298356574 +0100 +@@ -232,7 +232,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -254,6 +253,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/hw/xwin/Makefile.in xorg-server-1.7.99.1.patch/hw/xwin/Makefile.in +--- xorg-server-1.7.99.1/hw/xwin/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xwin/Makefile.in 2009-11-15 21:04:08.561356292 +0100 +@@ -355,7 +355,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -377,6 +376,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/include/dix-config.h.in xorg-server-1.7.99.1.patch/include/dix-config.h.in +--- xorg-server-1.7.99.1/include/dix-config.h.in 2009-10-13 19:04:27.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/include/dix-config.h.in 2009-11-15 20:28:56.194233079 +0100 +@@ -384,6 +384,9 @@ + /* Support D-Bus */ + #undef HAVE_DBUS + ++/* Use libudev for input hotplug */ ++#undef CONFIG_UDEV ++ + /* Use D-Bus for input hotplug */ + #undef CONFIG_NEED_DBUS + +diff -Naur xorg-server-1.7.99.1/include/do-not-use-config.h.in xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in +--- xorg-server-1.7.99.1/include/do-not-use-config.h.in 2009-10-21 18:07:28.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in 2009-11-15 21:03:50.000000000 +0100 +@@ -36,6 +36,9 @@ + /* Use D-Bus for input hotplug */ + #undef CONFIG_NEED_DBUS + ++/* Use libudev for input hotplug */ ++#undef CONFIG_UDEV ++ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +@@ -226,9 +229,6 @@ + /* Define to 1 if you have the `selinux' library (-lselinux). */ + #undef HAVE_LIBSELINUX + +-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ +-#undef HAVE_LIBWS2_32 +- + /* Define to 1 if you have the `link' function. */ + #undef HAVE_LINK + +@@ -448,9 +448,6 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + +-/* Define to the home page for this package. */ +-#undef PACKAGE_URL +- + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -Naur xorg-server-1.7.99.1/include/do-not-use-config.h.in~ xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in~ +--- xorg-server-1.7.99.1/include/do-not-use-config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ xorg-server-1.7.99.1.patch/include/do-not-use-config.h.in~ 2009-11-15 20:29:18.000000000 +0100 +@@ -0,0 +1,746 @@ ++/* include/do-not-use-config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define if building universal (internal helper macro) */ ++#undef AC_APPLE_UNIVERSAL_BUILD ++ ++/* Build AIGLX loader */ ++#undef AIGLX ++ ++/* Default base font path */ ++#undef BASE_FONT_PATH ++ ++/* Support BigRequests extension */ ++#undef BIGREQS ++ ++/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ ++#undef BSD44SOCKETS ++ ++/* Builder address */ ++#undef BUILDERADDR ++ ++/* Builder string */ ++#undef BUILDERSTRING ++ ++/* Default font path */ ++#undef COMPILEDDEFAULTFONTPATH ++ ++/* Support Composite Extension */ ++#undef COMPOSITE ++ ++/* Use the D-Bus input configuration API */ ++#undef CONFIG_DBUS_API ++ ++/* Use the HAL hotplug API */ ++#undef CONFIG_HAL ++ ++/* Use D-Bus for input hotplug */ ++#undef CONFIG_NEED_DBUS ++ ++/* Use libudev for input hotplug */ ++#undef CONFIG_UDEV ++ ++/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP ++ systems. This function is required for `alloca.c' support on those systems. ++ */ ++#undef CRAY_STACKSEG_END ++ ++/* System is BSD-like */ ++#undef CSRG_BASED ++ ++/* Simple debug messages */ ++#undef CYGDEBUG ++ ++/* Debug window manager */ ++#undef CYGMULTIWINDOW_DEBUG ++ ++/* Debug messages for window handling */ ++#undef CYGWINDOWING_DEBUG ++ ++/* Define to 1 if using `alloca.c'. */ ++#undef C_ALLOCA ++ ++/* Support Damage extension */ ++#undef DAMAGE ++ ++/* Support DBE extension */ ++#undef DBE ++ ++/* Use ddxBeforeReset */ ++#undef DDXBEFORERESET ++ ++/* Use OsVendorVErrorF */ ++#undef DDXOSVERRORF ++ ++/* Enable debugging code */ ++#undef DEBUG ++ ++/* Default library install path */ ++#undef DEFAULT_LIBRARY_PATH ++ ++/* Default log location */ ++#undef DEFAULT_LOGPREFIX ++ ++/* Default module search path */ ++#undef DEFAULT_MODULE_PATH ++ ++/* Support DGA extension */ ++#undef DGA ++ ++/* Support DPMS extension */ ++#undef DPMSExtension ++ ++/* Build DRI2 extension */ ++#undef DRI2 ++ ++/* Build DRI2 AIGLX loader */ ++#undef DRI2_AIGLX ++ ++/* Default DRI driver path */ ++#undef DRI_DRIVER_PATH ++ ++/* Build GLX extension */ ++#undef GLXEXT ++ ++/* Support XDM-AUTH*-1 */ ++#undef HASXDMAUTH ++ ++/* System has /dev/xf86 aperture driver */ ++#undef HAS_APERTURE_DRV ++ ++/* Cygwin has /dev/windows for signaling new win32 messages */ ++#undef HAS_DEVWINDOWS ++ ++/* Have the 'getdtablesize' function. */ ++#undef HAS_GETDTABLESIZE ++ ++/* Have the 'getifaddrs' function. */ ++#undef HAS_GETIFADDRS ++ ++/* Have the 'getpeereid' function. */ ++#undef HAS_GETPEEREID ++ ++/* Have the 'getpeerucred' function. */ ++#undef HAS_GETPEERUCRED ++ ++/* Have the 'mmap' function. */ ++#undef HAS_MMAP ++ ++/* Define to 1 if NetBSD built-in MTRR support is available */ ++#undef HAS_MTRR_BUILTIN ++ ++/* MTRR support available */ ++#undef HAS_MTRR_SUPPORT ++ ++/* Support SHM */ ++#undef HAS_SHM ++ ++/* Have the 'strlcpy' function */ ++#undef HAS_STRLCPY ++ ++/* Use Windows sockets */ ++#undef HAS_WINSOCK ++ ++/* Define to 1 if you have `alloca', as a function or macro. */ ++#undef HAVE_ALLOCA ++ ++/* Define to 1 if you have and it should be used (not on Ultrix). ++ */ ++#undef HAVE_ALLOCA_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_ASM_MTRR_H ++ ++/* Define to 1 if you have the `authdes_create' function. */ ++#undef HAVE_AUTHDES_CREATE ++ ++/* Define to 1 if you have the `authdes_seccreate' function. */ ++#undef HAVE_AUTHDES_SECCREATE ++ ++/* "Have avc_netlink_acquire_fd" */ ++#undef HAVE_AVC_NETLINK_ACQUIRE_FD ++ ++/* Has backtrace support */ ++#undef HAVE_BACKTRACE ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_BYTESWAP_H ++ ++/* Have the 'cbrt' function */ ++#undef HAVE_CBRT ++ ++/* Define to 1 if you have the `clock_gettime' function. */ ++#undef HAVE_CLOCK_GETTIME ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DBM_H ++ ++/* Have D-Bus support */ ++#undef HAVE_DBUS ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_DIRENT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ ++#undef HAVE_DOPRNT ++ ++/* Have execinfo.h */ ++#undef HAVE_EXECINFO_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_FCNTL_H ++ ++/* Define to 1 if you have the `ffs' function. */ ++#undef HAVE_FFS ++ ++/* Define to 1 if you have the `geteuid' function. */ ++#undef HAVE_GETEUID ++ ++/* Define to 1 if you have the `getisax' function. */ ++#undef HAVE_GETISAX ++ ++/* Define to 1 if you have the `getopt' function. */ ++#undef HAVE_GETOPT ++ ++/* Define to 1 if you have the `getopt_long' function. */ ++#undef HAVE_GETOPT_LONG ++ ++/* Define to 1 if you have the `getuid' function. */ ++#undef HAVE_GETUID ++ ++/* Define to 1 if you have the `getzoneid' function. */ ++#undef HAVE_GETZONEID ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the `audit' library (-laudit). */ ++#undef HAVE_LIBAUDIT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LIBAUDIT_H ++ ++/* Define to 1 if you have the `m' library (-lm). */ ++#undef HAVE_LIBM ++ ++/* Define to 1 if you have the `selinux' library (-lselinux). */ ++#undef HAVE_LIBSELINUX ++ ++/* Define to 1 if you have the `link' function. */ ++#undef HAVE_LINK ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LINUX_AGPGART_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LINUX_APM_BIOS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LINUX_FB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MACHINE_MTRR_H ++ ++/* Define to 1 if you have the `memmove' function. */ ++#undef HAVE_MEMMOVE ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the `memset' function. */ ++#undef HAVE_MEMSET ++ ++/* Define to 1 if you have the `mkstemp' function. */ ++#undef HAVE_MKSTEMP ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NDBM_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the `pci_device_enable' function. */ ++#undef HAVE_PCI_DEVICE_ENABLE ++ ++/* Define to 1 if you have the `pci_device_is_boot_vga' function. */ ++#undef HAVE_PCI_DEVICE_IS_BOOT_VGA ++ ++/* Define to 1 if you have the `pci_device_vgaarb_init' function. */ ++#undef HAVE_PCI_DEVICE_VGAARB_INIT ++ ++/* Define to 1 if you have the `pci_system_init_dev_mem' function. */ ++#undef HAVE_PCI_SYSTEM_INIT_DEV_MEM ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_RPCSVC_DBM_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SELINUX_AVC_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SELINUX_SELINUX_H ++ ++/* Use libmd SHA1 functions instead of OpenSSL libcrypto */ ++#undef HAVE_SHA1_IN_LIBMD ++ ++/* Define to 1 if you have the `shmctl64' function. */ ++#undef HAVE_SHMCTL64 ++ ++/* Define to 1 if the system has the type `socklen_t'. */ ++#undef HAVE_SOCKLEN_T ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the `strcasestr' function. */ ++#undef HAVE_STRCASESTR ++ ++/* Define to 1 if you have the `strchr' function. */ ++#undef HAVE_STRCHR ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STROPTS_H ++ ++/* Define to 1 if you have the `strrchr' function. */ ++#undef HAVE_STRRCHR ++ ++/* Define to 1 if you have the `strtol' function. */ ++#undef HAVE_STRTOL ++ ++/* Define to 1 if SYSV IPC is available */ ++#undef HAVE_SYSV_IPC ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_AGPGART_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_AGPIO_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_DIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_IO_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_KD_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_LINKER_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_MEMRANGE_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_NDIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_VM86_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_VT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `vprintf' function. */ ++#undef HAVE_VPRINTF ++ ++/* Define to 1 if you have the `vsnprintf' function. */ ++#undef HAVE_VSNPRINTF ++ ++/* Define to 1 if you have the `walkcontext' function. */ ++#undef HAVE_WALKCONTEXT ++ ++/* Support IPv6 for TCP connections */ ++#undef IPv6 ++ ++/* Build kdrive ddx */ ++#undef KDRIVEDDXACTIONS ++ ++/* Build fbdev-based kdrive server */ ++#undef KDRIVEFBDEV ++ ++/* Build Kdrive X server */ ++#undef KDRIVESERVER ++ ++/* Build VESA-based kdrive servers */ ++#undef KDRIVEVESA ++ ++/* Prefix to use for launchd identifiers */ ++#undef LAUNCHD_ID_PREFIX ++ ++/* Support os-specific local connections */ ++#undef LOCALCONN ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ ++/* Support MIT-SHM extension */ ++#undef MITSHM ++ ++/* Have monotonic clock from clock_gettime() */ ++#undef MONOTONIC_CLOCK ++ ++/* Build Multibuffer extension */ ++#undef MULTIBUFFER ++ ++/* Do not have 'strcasecmp'. */ ++#undef NEED_STRCASECMP ++ ++/* Do not have 'strcasestr'. */ ++#undef NEED_STRCASESTR ++ ++/* Do not have 'strncasecmp'. */ ++#undef NEED_STRNCASECMP ++ ++/* Need XFree86 helper functions */ ++#undef NEED_XF86_PROTOTYPES ++ ++/* Need XFree86 typedefs */ ++#undef NEED_XF86_TYPES ++ ++/* Define to 1 if modules should avoid the libcwrapper */ ++#undef NO_LIBCWRAPPER ++ ++/* Use an empty root cursor */ ++#undef NULL_ROOT_CURSOR ++ ++/* Operating System Name */ ++#undef OSNAME ++ ++/* Operating System Vendor */ ++#undef OSVENDOR ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Internal define for Xinerama */ ++#undef PANORAMIX ++ ++/* System has PC console */ ++#undef PCCONS_SUPPORT ++ ++/* Default PCI text file ID path */ ++#undef PCI_TXT_IDS_PATH ++ ++/* System has PC console */ ++#undef PCVT_SUPPORT ++ ++/* Overall prefix */ ++#undef PROJECTROOT ++ ++/* Support RANDR extension */ ++#undef RANDR ++ ++/* Make PROJECT_ROOT relative to the xserver location */ ++#undef RELOCATE_PROJECTROOT ++ ++/* Support RENDER extension */ ++#undef RENDER ++ ++/* Support X resource extension */ ++#undef RES ++ ++/* Define as the return type of signal handlers (`int' or `void'). */ ++#undef RETSIGTYPE ++ ++/* Build Rootless code */ ++#undef ROOTLESS ++ ++/* Support MIT-SCREEN-SAVER extension */ ++#undef SCREENSAVER ++ ++/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ ++#undef SECURE_RPC ++ ++/* Server miscellaneous config path */ ++#undef SERVER_MISC_CONFIG_PATH ++ ++/* Support SHAPE extension */ ++#undef SHAPE ++ ++/* The size of `unsigned long', as computed by sizeof. */ ++#undef SIZEOF_UNSIGNED_LONG ++ ++/* If using the C implementation of alloca, define if you know the ++ direction of stack growth for your system; otherwise it will be ++ automatically deduced at runtime. ++ STACK_DIRECTION > 0 => grows toward higher addresses ++ STACK_DIRECTION < 0 => grows toward lower addresses ++ STACK_DIRECTION = 0 => direction of growth unknown */ ++#undef STACK_DIRECTION ++ ++/* Build a standalone xpbproxy */ ++#undef STANDALONE_XPBPROXY ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Define to 1 on systems derived from System V Release 4 */ ++#undef SVR4 ++ ++/* System has syscons console */ ++#undef SYSCONS_SUPPORT ++ ++/* Support TCP socket connections */ ++#undef TCPCONN ++ ++/* Have tslib support */ ++#undef TSLIB ++ ++/* Enable unit tests */ ++#undef UNITTESTS ++ ++/* Support UNIX socket connections */ ++#undef UNIXCONN ++ ++/* NetBSD PIO alpha IO */ ++#undef USE_ALPHA_PIO ++ ++/* BSD AMD64 iopl */ ++#undef USE_AMD64_IOPL ++ ++/* BSD /dev/io */ ++#undef USE_DEV_IO ++ ++/* BSD i386 iopl */ ++#undef USE_I386_IOPL ++ ++/* Use SIGIO handlers for input device events by default */ ++#undef USE_SIGIO_BY_DEFAULT ++ ++/* Define to use byteswap macros from */ ++#undef USE_SYS_ENDIAN_H ++ ++/* Vendor man version */ ++#undef VENDOR_MAN_VERSION ++ ++/* Vendor name */ ++#undef VENDOR_NAME ++ ++/* Vendor name */ ++#undef VENDOR_NAME_SHORT ++ ++/* Vendor release */ ++#undef VENDOR_RELEASE ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Building vgahw module */ ++#undef WITH_VGAHW ++ ++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most ++ significant byte first (like Motorola and SPARC, unlike Intel). */ ++#if defined AC_APPLE_UNIVERSAL_BUILD ++# if defined __BIG_ENDIAN__ ++# define WORDS_BIGENDIAN 1 ++# endif ++#else ++# ifndef WORDS_BIGENDIAN ++# undef WORDS_BIGENDIAN ++# endif ++#endif ++ ++/* System has wscons console */ ++#undef WSCONS_SUPPORT ++ ++/* Build X-ACE extension */ ++#undef XACE ++ ++/* Build XCalibrate extension */ ++#undef XCALIBRATE ++ ++/* Support XCMisc extension */ ++#undef XCMISC ++ ++/* Build Security extension */ ++#undef XCSECURITY ++ ++/* Support XDM Control Protocol */ ++#undef XDMCP ++ ++/* Support XF86 Big font extension */ ++#undef XF86BIGFONT ++ ++/* Name of configuration file */ ++#undef XF86CONFIGFILE ++ ++/* Build DRI extension */ ++#undef XF86DRI ++ ++/* Support XFree86 Video Mode extension */ ++#undef XF86VIDMODE ++ ++/* Support XFixes extension */ ++#undef XFIXES ++ ++/* Building loadable XFree86 server */ ++#undef XFree86LOADER ++ ++/* Building XFree86 server */ ++#undef XFree86Server ++ ++/* Build XDGA support */ ++#undef XFreeXDGA ++ ++/* Support Xinerama extension */ ++#undef XINERAMA ++ ++/* Path to XKB data */ ++#undef XKB_BASE_DIRECTORY ++ ++/* Path to XKB bin dir */ ++#undef XKB_BIN_DIRECTORY ++ ++/* Default XKB layout */ ++#undef XKB_DFLT_LAYOUT ++ ++/* Default XKB model */ ++#undef XKB_DFLT_MODEL ++ ++/* Default XKB options */ ++#undef XKB_DFLT_OPTIONS ++ ++/* Default XKB ruleset */ ++#undef XKB_DFLT_RULES ++ ++/* Default XKB variant */ ++#undef XKB_DFLT_VARIANT ++ ++/* Path to XKB output dir */ ++#undef XKM_OUTPUT_DIR ++ ++/* Building Xorg server */ ++#undef XORGSERVER ++ ++/* Vendor release */ ++#undef XORG_DATE ++ ++/* Vendor man version */ ++#undef XORG_MAN_VERSION ++ ++/* Building Xorg server */ ++#undef XORG_SERVER ++ ++/* Current Xorg version */ ++#undef XORG_VERSION_CURRENT ++ ++/* Have Quartz */ ++#undef XQUARTZ ++ ++/* Support application updating through sparkle. */ ++#undef XQUARTZ_SPARKLE ++ ++/* Support Record extension */ ++#undef XRECORD ++ ++/* Build registry module */ ++#undef XREGISTRY ++ ++/* Build SELinux extension */ ++#undef XSELINUX ++ ++/* Define to 1 if the DTrace Xserver provider probes should be built in. */ ++#undef XSERVER_DTRACE ++ ++/* Use libpciaccess for all pci manipulation */ ++#undef XSERVER_LIBPCIACCESS ++ ++/* Support XSync extension */ ++#undef XSYNC ++ ++/* Support XTest extension */ ++#undef XTEST ++ ++/* Support Xv extension */ ++#undef XV ++ ++/* Vendor name */ ++#undef XVENDORNAME ++ ++/* Short vendor name */ ++#undef XVENDORNAMESHORT ++ ++/* Build Xv extension */ ++#undef XvExtension ++ ++/* Build XvMC extension */ ++#undef XvMCExtension ++ ++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a ++ `char[]'. */ ++#undef YYTEXT_POINTER ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Enable GNU and other extensions to the C environment for glibc */ ++#undef _GNU_SOURCE ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ ++/* Define to 1 if unsigned long is 64 bits. */ ++#undef _XSERVER64 ++ ++/* Vendor web address for support */ ++#undef __VENDORDWEBSUPPORT__ ++ ++/* Name of configuration file */ ++#undef __XCONFIGFILE__ ++ ++/* Name of X server */ ++#undef __XSERVERNAME__ ++ ++/* Define to 16-bit byteswap macro */ ++#undef bswap_16 ++ ++/* Define to 32-bit byteswap macro */ ++#undef bswap_32 ++ ++/* Define to 64-bit byteswap macro */ ++#undef bswap_64 ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const ++ ++/* Define to `int' if does not define. */ ++#undef pid_t +diff -Naur xorg-server-1.7.99.1/include/Makefile.in xorg-server-1.7.99.1.patch/include/Makefile.in +--- xorg-server-1.7.99.1/include/Makefile.in 2009-10-21 18:07:20.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/include/Makefile.in 2009-11-15 21:04:08.725356051 +0100 +@@ -241,7 +241,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -263,6 +262,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/Makefile.in xorg-server-1.7.99.1.patch/Makefile.in +--- xorg-server-1.7.99.1/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/Makefile.in 2009-11-15 21:04:11.562356781 +0100 +@@ -282,7 +282,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -304,6 +303,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/mi/Makefile.in xorg-server-1.7.99.1.patch/mi/Makefile.in +--- xorg-server-1.7.99.1/mi/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/mi/Makefile.in 2009-11-15 21:04:08.905356508 +0100 +@@ -266,7 +266,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -288,6 +287,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/miext/cw/Makefile.in xorg-server-1.7.99.1.patch/miext/cw/Makefile.in +--- xorg-server-1.7.99.1/miext/cw/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/miext/cw/Makefile.in 2009-11-15 21:04:09.233356027 +0100 +@@ -230,7 +230,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -252,6 +251,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/miext/damage/Makefile.in xorg-server-1.7.99.1.patch/miext/damage/Makefile.in +--- xorg-server-1.7.99.1/miext/damage/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/miext/damage/Makefile.in 2009-11-15 21:04:09.401356728 +0100 +@@ -256,7 +256,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -278,6 +277,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/miext/Makefile.in xorg-server-1.7.99.1.patch/miext/Makefile.in +--- xorg-server-1.7.99.1/miext/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/miext/Makefile.in 2009-11-15 21:04:09.066357568 +0100 +@@ -246,7 +246,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -268,6 +267,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/miext/rootless/Makefile.in xorg-server-1.7.99.1.patch/miext/rootless/Makefile.in +--- xorg-server-1.7.99.1/miext/rootless/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/miext/rootless/Makefile.in 2009-11-15 21:04:09.563359823 +0100 +@@ -231,7 +231,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -253,6 +252,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/miext/shadow/Makefile.in xorg-server-1.7.99.1.patch/miext/shadow/Makefile.in +--- xorg-server-1.7.99.1/miext/shadow/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/miext/shadow/Makefile.in 2009-11-15 21:04:09.737356457 +0100 +@@ -261,7 +261,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -283,6 +282,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/os/Makefile.in xorg-server-1.7.99.1.patch/os/Makefile.in +--- xorg-server-1.7.99.1/os/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/os/Makefile.in 2009-11-15 21:04:09.927356235 +0100 +@@ -254,7 +254,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -276,6 +275,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/randr/Makefile.in xorg-server-1.7.99.1.patch/randr/Makefile.in +--- xorg-server-1.7.99.1/randr/Makefile.in 2009-10-21 18:07:21.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/randr/Makefile.in 2009-11-15 21:04:10.131356133 +0100 +@@ -265,7 +265,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -287,6 +286,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/record/Makefile.in xorg-server-1.7.99.1.patch/record/Makefile.in +--- xorg-server-1.7.99.1/record/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/record/Makefile.in 2009-11-15 21:04:10.286357001 +0100 +@@ -230,7 +230,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -252,6 +251,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/render/Makefile.in xorg-server-1.7.99.1.patch/render/Makefile.in +--- xorg-server-1.7.99.1/render/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/render/Makefile.in 2009-11-15 21:04:10.453357344 +0100 +@@ -259,7 +259,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -281,6 +280,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/test/Makefile.in xorg-server-1.7.99.1.patch/test/Makefile.in +--- xorg-server-1.7.99.1/test/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/test/Makefile.in 2009-11-15 21:04:10.704356048 +0100 +@@ -301,7 +301,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -323,6 +322,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/test/xi2/Makefile.in xorg-server-1.7.99.1.patch/test/xi2/Makefile.in +--- xorg-server-1.7.99.1/test/xi2/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/test/xi2/Makefile.in 2009-11-15 21:04:11.050356143 +0100 +@@ -368,7 +368,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -390,6 +389,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/Xext/Makefile.in xorg-server-1.7.99.1.patch/Xext/Makefile.in +--- xorg-server-1.7.99.1/Xext/Makefile.in 2009-10-21 18:07:08.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/Xext/Makefile.in 2009-11-15 21:03:55.063356117 +0100 +@@ -331,7 +331,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -353,6 +352,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/xfixes/Makefile.in xorg-server-1.7.99.1.patch/xfixes/Makefile.in +--- xorg-server-1.7.99.1/xfixes/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/xfixes/Makefile.in 2009-11-15 21:04:11.215355771 +0100 +@@ -257,7 +257,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -279,6 +278,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/Xi/Makefile.in xorg-server-1.7.99.1.patch/Xi/Makefile.in +--- xorg-server-1.7.99.1/Xi/Makefile.in 2009-10-21 18:07:08.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/Xi/Makefile.in 2009-11-15 21:03:55.230356461 +0100 +@@ -241,7 +241,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -263,6 +262,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@ +diff -Naur xorg-server-1.7.99.1/xkb/Makefile.in xorg-server-1.7.99.1.patch/xkb/Makefile.in +--- xorg-server-1.7.99.1/xkb/Makefile.in 2009-10-21 18:07:22.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/xkb/Makefile.in 2009-11-15 21:04:11.398355837 +0100 +@@ -266,7 +266,6 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@ +@@ -288,6 +287,8 @@ + STRIP = @STRIP@ + TSLIB_CFLAGS = @TSLIB_CFLAGS@ + TSLIB_LIBS = @TSLIB_LIBS@ ++UDEV_CFLAGS = @UDEV_CFLAGS@ ++UDEV_LIBS = @UDEV_LIBS@ + UTILS_SYS_LIBS = @UTILS_SYS_LIBS@ + VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@ + VERSION = @VERSION@