Merge lp:~bregma/xorg-gtest/xorg-gtest into lp:ubuntu/raring/xorg-gtest

[Stephen M. Webb]

Import newer upstream v0.7.0.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'COPYING'
--- COPYING	2012-03-19 18:39:04 +0000
+++ COPYING	2013-01-21 00:48:20 +0000
@@ -1,4 +1,5 @@
 Copyright (C) 2011, 2012 Canonical, Ltd.
+Copyright © 2012 Red Hat, Inc.
 
 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

=== modified file 'ChangeLog'
--- ChangeLog	2012-06-08 12:39:52 +0000
+++ ChangeLog	2013-01-21 00:48:20 +0000
@@ -1,1273 +0,0 @@
-commit 3774f91ba3722bd56b532dde549aef1df1749a51
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Jun 8 12:01:23 2012 -0700
-
-    Release version 0.3.0
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 9c8986c3d9854cb9a6f1f5dc39b8c16a1139ae91
-Author: Peter Hutterer <[e-mail]>
-Date:   Tue Jun 5 14:49:34 2012 +1000
-
-    Set log verbosity to 10
-    
-    Might as well get as much data as possible.
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 0c038b4c0a63f494eb7aec08baace7e750ab1b81
-Author: Chase Douglas <[e-mail]>
-Date:   Fri May 25 08:17:57 2012 -0700
-
-    Check if log file and old log file are writable before starting X server
-    
-    Otherwise, the server will fail to start and it won't be obvious what
-    happened.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit 68b4ef7b5f100a14a5aee33d5c34ef8b29bafa3b
-Author: Chase Douglas <[e-mail]>
-Date:   Fri May 25 07:40:49 2012 -0700
-
-    Check if a server is already running on the chosen display name
-    
-    Otherwise, our server will silently die and we will connect to the
-    already running server without knowing.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit 2b5f29b84b87040be9ad6ce8d986b23bab253189
-Author: Peter Hutterer <[e-mail]>
-Date:   Fri May 25 11:57:20 2012 +1000
-
-    XCloseDisplay(3) cannot handle NULL
-    
-    If the display failed to start, tearing it down with a NULL pointer causes a
-    segfault.
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 631aa80fe44b21dfac2938f2702d3ab15365dfba
-Author: Peter Hutterer <[e-mail]>
-Date:   Fri May 25 11:57:19 2012 +1000
-
-    Print the display we were trying to start up on.
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit b6fb8681c4b56f6028f9c981cfa27f6466ff74bd
-Merge: d5bc8f1 6a1174b
-Author: Chase Douglas <[e-mail]>
-Date:   Thu May 24 10:00:25 2012 -0700
-
-    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/test/xorg-gtest
-
-commit 6a1174b8cdfc2079dd72209f49197d7a9c6555f1
-Author: Peter Hutterer <[e-mail]>
-Date:   Thu May 24 13:13:28 2012 +1000
-
-    Update source files to use new headers
-    
-    introduced in e1c010f23272e61c28c73aa603b477ba6fbae875
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit e1c010f23272e61c28c73aa603b477ba6fbae875
-Author: Chase Douglas <[e-mail]>
-Date:   Fri May 18 13:23:32 2012 -0700
-
-    Namespace xorg-gtest header filenames
-    
-    Due to the default automake compilation flags including -I. -I.., it is
-    possible to pick up an xorg-gtest header like device.h instead of a
-    project header. Namespacing the headers should resolve this issue. Users
-    should be including xorg-gtest.h instead of individual headers, so this
-    should not cause compilation failures.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit d57dc7dc787af4b5a9728b83eb1cfccf94ff08b0
-Author: Chase Douglas <[e-mail]>
-Date:   Fri May 18 13:23:31 2012 -0700
-
-    Add comment to Makefile-xorg-gtest.am about compiling with -w
-    
-    Users of xorg-gtest will not want warnings or failed builds due to
-    issues in gtest or xorg-gtest.
-    
-    Note that the internal build of the xorg-gtest example does not use the
-    -w flag when building examples, so we will still see warnings when
-    xorg-gtest itself is built.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit d5bc8f147f25f4a5aff8011a2ea542ddd606df23
-Author: Chase Douglas <[e-mail]>
-Date:   Fri May 18 13:16:25 2012 -0700
-
-    Namespace xorg-gtest header filenames
-    
-    Due to the default automake compilation flags including -I. -I.., it is
-    possible to pick up an xorg-gtest header like device.h instead of a
-    project header. Namespacing the headers should resolve this issue. Users
-    should be including xorg-gtest.h instead of individual headers, so this
-    should not cause compilation failures.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 5b0320cf21aa64d6359319f95194efd60288c924
-Author: Chase Douglas <[e-mail]>
-Date:   Fri May 18 13:11:21 2012 -0700
-
-    Add comment to Makefile-xorg-gtest.am about compiling with -w
-    
-    Users of xorg-gtest will not want warnings or failed builds due to
-    issues in gtest or xorg-gtest.
-    
-    Note that the internal build of the xorg-gtest example does not use the
-    -w flag when building examples, so we will still see warnings when
-    xorg-gtest itself is built.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit ae1e069ad03682d6f6e830bf6d237e41984d3cf3
-Author: Peter Hutterer <[e-mail]>
-Date:   Wed May 16 09:08:40 2012 +1000
-
-    examples: built tests as noinst_PROGRAMS
-    
-    check_PROGRAMS is only built on make check, so it's a good way of
-    introducing build errors until later (as we discovered in the server).
-    Always built the tests, running them is optional.
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 31b64e0fbc8dfe420d51e325c67a07e2eaa413f7
-Author: Peter Hutterer <[e-mail]>
-Date:   Wed May 16 09:07:41 2012 +1000
-
-    m4: if a source is specified, use that for the include path
-    
-    Don't require users to specify both source and include path. We can assume
-    that if they have the source at a certain location, they want those headers
-    too.
-    
-    Signed-off-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 6b66ce9fc632108a765a8e96cd287b6179f9cbb0
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Apr 20 09:41:45 2012 -0700
-
-    Wait for dummy X server to shut down in Environment::TearDown()
-    
-    If two xorg-gtest binaries are executed one after another, the second
-    one may attempt to start its X server before the first one's X server
-    has fully shut down. This leads to the second X server not starting.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Stephen M. Webb <[e-mail]>
-
-commit 080cee4010157b45c60b5693eca4f9aebda0c900
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Apr 18 10:30:18 2012 -0700
-
-    Provide a full server layout in dummy.conf
-    
-    The X.org server uses the first server layout, and provides one if none
-    are found. If a layout is specified in /usr/share/X11/xorg.conf.d, the
-    dummy video device configuration may not be used.
-    
-    This change ensures that the dummy video device is used by providing a
-    full server layout in the main configuration file.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Stephen M. Webb <[e-mail]>
-
-commit 91261b2371dedc0b8eba9161950b099c130c408a
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Apr 18 10:24:50 2012 -0700
-
-    Kill dummy Xorg server when a terminating signal arrives
-    
-    This only takes effect if the program links in the provided main()
-    function. If you provide your own main() you must handle signals
-    yourself.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Stephen M. Webb <[e-mail]>
-
-commit ff1f42e50b36885008e6f8b82595dec8949deba3
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Apr 18 10:23:38 2012 -0700
-
-    Add Environment::Kill() to forcefully terminate the dummy Xorg server
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Stephen M. Webb <[e-mail]>
-
-commit 1e7618f41e48e29c8dfa30cb74dbdeb8ebd83896
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Mar 26 09:55:21 2012 -0700
-
-    Add missing Identifier name to 99-virtual-test-devices.conf
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit c77b5e188451c7ac9995ade5e3cf069ccc803e8e
-Author: Thomas Voß <[e-mail]>
-Date:   Thu Mar 22 14:59:19 2012 -0400
-
-    Add an xorg configuration file snippet to disable grabbing of test devices.
-    
-    When a test creates a test trackpad device, an already running X server
-    will likely grab the event node. This causes the dummy X server to fail
-    to instantiate the device, and ends in test failure.
-    
-    This will ensure that the normal X server does not attempt to grab the
-    test device.
-    
-    Signed-off-by: Thomas Voß <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Acked-by: Peter Hutterer <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit ad440d9c228a44981f1e2364fb0678840b08be3c
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Mar 19 17:00:45 2012 -0700
-
-    Release version 0.2.0
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 852b504288ca579a06b741b4588ee1b98b1b45f5
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 14:51:40 2012 -0800
-
-    Ship xorg-gtest.m4 and Makefile-xorg-gtest.am
-    
-    See README for instructions on how to use them.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Christopher James Halse Rogers <[e-mail]>
-
-commit 3f019e8272e33869312a7b5a94af94e14c81cd15
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Mar 13 23:30:39 2012 -0700
-
-    Print more helpful error message when X server fails to start
-    
-    Usually, xorg-gtest requires the dummy video driver. It also requires an
-    X server at least version 1.12, or to be run as root when testing with a
-    previous X server. Print this information when the server fails to
-    start, and point the user to the log file for further details.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit 6d0cd228d5ea5ff734f3bc1754d0dfbb93e6d1b4
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Mar 13 11:32:02 2012 -0700
-
-    Allow user to override default Xorg server binary
-    
-    This can be accomplished by compiling xorg-gtest with
-    -DDEFAULT_XORG_SERVER=path/to/Xorg.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit 4acb16f939c73dc081775e29eb4089e4184fffbf
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 14:24:16 2012 -0800
-
-    Install, but do not build into a library, the xorg-gtest sources
-    
-    This mimics the Google Test distribution mechanism. See:
-    
-    http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit 71f006cadac2bc7f249965896d898143d7592f12
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 14:18:39 2012 -0800
-
-    Build gtest as part of the project
-    
-    Google Test does not recommend using precompiled gtest libraries. See:
-    
-    http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog
-    
-    This change modifies the build system so the examples build the gtest
-    and xorg-gtest libraries and link against the locally built libraries
-    instead of any other precompiled libraries on the system. It uses the
-    same compiler flags to compile everything so the C++ One-Definition Rule
-    is not broken.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit d02b5095dbe69b695034242a978c489aaef61109
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 14:00:04 2012 -0800
-
-    Provide meta-source file xorg-gtest-all.cpp
-    
-    This will make compiling the project each time it is used much easier.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit 5afddf4681d6ce651164c5486a15b41a0b098ac4
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 11:55:01 2012 -0800
-
-    Rename main.cpp to xorg-gtest_main.cpp
-    
-    This matches the library name and will help with understanding what the
-    includes since we are now shipping the source code.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit e0f7ec50461b68851cfb13c7b73c1ee4faa7a7d5
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 11:50:05 2012 -0800
-
-    Add a meta-header xorg-gtest.h
-    
-    The header merely includes all the other headers. It will make building
-    xorg-gtest into each project easier.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit 7102f4115ed044a903c5071e6930630456778313
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 09:38:05 2012 -0800
-
-    Install xorg-gtest source code in $(prefix)/src/xorg-gtest
-    
-    Google Test suggests that source code be built into each test rather
-    than use a pre-compiled library. This change follows their lead and
-    installs the xorg-gtest source code.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit fcb1f66c5caec990d499bff94215057b221ea004
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 8 09:42:37 2012 -0800
-
-    Move xorg-gtest.cpp to xorg-gtest-example.cpp
-    
-    This makes the source file match the built executable.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-By: Christopher Halse Rogers <[e-mail]>
-
-commit 3a8d82db172612f6071b0ab5423828ff6daad2b7
-Author: Gaetan Nadon <[e-mail]>
-Date:   Thu Mar 8 19:48:28 2012 -0500
-
-    config: merge both AC_CONFIG_FILES statements.
-    
-    Typically all modules have a single statement unless some output files
-    are conditionally generated.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 23ce7387c7a762626aef6ffb2c3970a714716595
-Author: Gaetan Nadon <[e-mail]>
-Date:   Thu Mar 8 19:48:27 2012 -0500
-
-    config: remove unrequired AC_SUBST DUMMY_CONF_PATH statement
-    
-    The variable is not used in any makefile. Configure.ac does not participate
-    in the determination of the conf path. The final value of datadir is not
-    known at config time, only at make time.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 9bccebeff291e21e9d65c168fabce39e4ba9e97a
-Author: Gaetan Nadon <[e-mail]>
-Date:   Thu Mar 8 17:33:21 2012 -0500
-
-    config: use existing feature --enable-strict-compilation
-    
-    This replaces current code attempting to perform similar function.
-    In configure.ac, the code is gcc specific.
-    The src/Makefile.am has $(WARNING_FLAGS) rather than $(WARNING_CPPFLAGS)
-    
-    http://cgit.freedesktop.org/xorg/util/macros/tree/xorg-macros.m4.in
-    
-    Looking at the xorg-gtest module --help text:
-      --enable-strict-compilation
-                              Enable all warnings from compiler and make them
-                              errors (default: disabled)
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit ea7303900e3689d5b258bd5d61593f8b1ae3b4b0
-Author: Gaetan Nadon <[e-mail]>
-Date:   Thu Mar 8 17:33:20 2012 -0500
-
-    config: support Automake 1.10
-    
-    X.Org has a requirement to support 1.10 or later.
-    The silent rules are handled by XORG_DEFAULT_OPTIONS
-    We do not write the version number, but refer to the wiki:
-    http://www.x.org/wiki/ModularDevelopersGuide#GNU_Build_System
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit caec23aa80e92ad760dbcd4f285e62cbea6a99c3
-Author: Gaetan Nadon <[e-mail]>
-Date:   Thu Mar 8 17:33:19 2012 -0500
-
-    config: remove redundant AC_PROG_INSTALL
-    
-    Already included in XORG_DEFAULT_OPTIONS
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 0a55043449c23f12fc3c2385b2c2784ee6826749
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Mar 5 10:52:21 2012 -0800
-
-    Add xorg::testing::evemu::Device
-    
-    Device uses utouch-evemu for input device recording playback through the
-    Linux kernel.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Acked-by: Peter Hutterer <[e-mail]>
-    Reviewed-by: Stephen Webb <[e-mail]>
-
-commit bf4a7db2485ab2d28a6bb6333df7d431a928cc95
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Mar 6 17:15:58 2012 -0800
-
-    Fix dummy.conf location definition
-    
-    Now that the xorg-gtest data build has been separated from the src
-    build, the location definition is broken and results in xorg-gtest
-    looking for /dummy.conf instead of ${datadir}/xorg/gtest/dummy.conf.
-    This change fixes the location
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit b36f5493258e8fb896ed4a710b03c7428a2cf21b
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Mar 5 11:31:57 2012 -0800
-
-    Add examples/xorg-gtest-example to .gitignore
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit dd6e963e0833b2920f1bb120b6fba6e2e3c60121
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Mar 5 11:26:38 2012 -0800
-
-    Define automake CPP warning flags in Makefile.am, not configure.ac
-    
-    Otherwise, AM_CPPFLAGS could not be overridden in Makefile.am.
-    
-    Also, move AM_CXXFLAGS to the top of src/Makefile.am to match.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit e888dcd08cb4b5ee332f155207a56f7098524e14
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Feb 29 12:26:48 2012 -0800
-
-    Use BASE_CXXFLAGS from xorg macros
-    
-    The X.org macros package version 1.16.2 is the first to define
-    BASE_CXXFLAGS; however, we don't need to require version 1.16.2. If it's
-    available, then great. If not, $(BASE_CXXFLAGS) will be empty and
-    nothing terrible will happen.
-    
-    Included in this commit is a fix for an error, now that we are using
-    BASE_CXXFLAGS, for shadowing variables from parent contexts.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit 63a2903a15d53a19930b72ffda06b92492718e6c
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Mar 5 11:07:48 2012 -0800
-
-    Split data and include build rules out of src build rules
-    
-    This will simplify things when we add more features to xorg-gtest.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Peter Hutterer <[e-mail]>
-
-commit 20827807711933b0083458c968aa6bbc06db859f
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Mar 1 10:24:59 2012 -0800
-
-    Relicense under the X.org preferred license
-    
-    Copied from http://www.x.org/releases/X11R7.6/doc/xorg-docs/License.html
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Acked-by: Daniel Stone <[e-mail]>
-    Reviewed-by: Gaetan Nadon <[e-mail]>
-
-commit 3e9e3232638a75e21f3ef2ca12888aaade8792f4
-Author: Gaetan Nadon <[e-mail]>
-Date:   Wed Feb 29 18:23:44 2012 -0500
-
-    config: do not initialize libtool twice
-    
-    AC_PROG_LIBTOOL initializes libtool, contrary to what the name may suggest.
-    It has been renamed to LT_INIT in libtool v2. However X.Org has a requirement
-    to support libtool v1.5.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit e43cc450a17245f838dfacb44492cf10383bdbb6
-Author: Gaetan Nadon <[e-mail]>
-Date:   Wed Feb 29 18:23:43 2012 -0500
-
-    config: no need to m4_include gtest.m4
-    
-    This is done when autoconf runs aclocal.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 8812b410c2458329ac8648b31f6f7e1f2b428df1
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Feb 29 10:55:33 2012 -0800
-
-    Remove xorg-server pkgconfig check
-    
-    xorg-server flags are not needed. Including them also causes
-    -fvisibility=hidden to be used, which breaks the build output.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Gaeton Nadon <[e-mail]>
-
-commit c444aebf7a56183531055767bf982f0206da3db0
-Author: Gaetan Nadon <[e-mail]>
-Date:   Mon Feb 27 11:04:36 2012 -0500
-
-    distcheck: cannot create directory `xorg-gtest-0.1.1': Permission denied
-    
-    Use the util-macros implementation to generate the ChangeLog
-    and the INSTALL file.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-
-commit e19ee59526198734118a5894ef2c4cef97528064
-Author: Gaetan Nadon <[e-mail]>
-Date:   Mon Feb 27 11:04:35 2012 -0500
-
-    distcheck fails: cannot open linker script file libxorg-gtest.ver
-    
-    The $(top_srcdir) path is needed to locate the source as it is not
-    in the same dir as the generated files.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 749b0eabd8c6075cac082b3727da5efdcc68d6e6
-Author: Gaetan Nadon <[e-mail]>
-Date:   Sun Feb 26 19:53:45 2012 -0500
-
-    Revert "Use the standard autogen.sh script from xorg"
-    
-    This reverts commit 839257c03d033f4352243ac70be9f78c5a8dfdd0.
-    
-    This module has different requirements for autogen.sh.
-    The upcoming version with the variable NOCONFIGURE
-    would probably be satisfactory.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 131c80ac6b199988b08df26f30dabe1c7ba9684a
-Author: Gaetan Nadon <[e-mail]>
-Date:   Sun Feb 26 16:36:55 2012 -0500
-
-    examples/test.cpp: fatal error: X11/Xlib.h: No such file or directory
-    
-    Need XSERVER_CFLAGS to locate Xlib.h
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-
-commit 35d0a43e9a059e54e95fda1211112104ad6ad262
-Author: Gaetan Nadon <[e-mail]>
-Date:   Sun Feb 26 16:08:55 2012 -0500
-
-    test.cpp: fatal error: X11/Xlib.h: No such file or directory
-    
-    Need XSERVER_CFLAGS to locate Xlib.h
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-
-commit 6bae528bd9c8744d39b003c06f4f0a2ab41c9331
-Author: Gaetan Nadon <[e-mail]>
-Date:   Sun Feb 26 16:20:25 2012 -0500
-
-    Fix typo in .gitignore comment
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-
-commit 5c5dc5ee2891a2456b77ec322e847ba9234112b0
-Author: Gaetan Nadon <[e-mail]>
-Date:   Sun Feb 26 16:12:43 2012 -0500
-
-    Add standard xorg toplevel .gitignore
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-
-commit 839257c03d033f4352243ac70be9f78c5a8dfdd0
-Author: Gaetan Nadon <[e-mail]>
-Date:   Sun Feb 26 14:26:33 2012 -0500
-
-    Use the standard autogen.sh script from xorg
-    
-    The one here does not work the same way. It is very confusing when
-    these don't work the same way for all xorg modules.
-    
-    It can be proposed as a new version version for all xorg modules
-    if it can be deemed to be more desirable.
-    
-    Signed-off-by: Gaetan Nadon <[e-mail]>
-
-commit a15d88e39f19efdd6aa20053a7a3ce6ffc8c0d9e
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Feb 24 08:39:56 2012 -0800
-
-    Release version 0.1.1
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 6422b13b33438a1dfa2d57c2df3593fcac719814
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Feb 24 08:35:13 2012 -0800
-
-    Generate ChangeLog at make dist time
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 66bcd7de0d9bd4a822b6cf3bca79d295d7fb86ab
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Feb 24 08:01:17 2012 -0800
-
-    Add GPLv3 license as COPYING
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 5b130039fed4bb232d06aa419bf43336a7153e07
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Feb 24 07:58:03 2012 -0800
-
-    Link libxorg-gtest_main against libxorg-gtest
-    
-    This fixes build failures if one only links against libxorg-gtest_main
-    but does not use any other xorg-gtest symbols.
-    
-    Reported-by: Stephen Webb <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit fc02e9aa96646c0ea60384b14083107a10e965b2
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Feb 15 08:54:08 2012 -0800
-
-    Fix linking against X server libs
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 1f4bd9c267e70cf9ac8a57f90bf1795b0fa63d6c
-Author: Chase Douglas <[e-mail]>
-Date:   Sat Feb 4 11:47:35 2012 -0800
-
-    Add symbol version scripts
-    
-    It would be nice to explicitly list each class method, but there's no
-    documentation on how to do it, and everything I try fails. At least this
-    ensures we don't ship visible symbols that are really part of GTest.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-    Reviewed-by: Stephen Webb <[e-mail]>
-
-commit 4216fddec31fed8b141f6d6f233c31e73e651fde
-Author: Daniel d'Andrada <[e-mail]>
-Date:   Mon Feb 6 09:29:46 2012 -0200
-
-    Make Environment API property-based.
-    
-    Instead of shoving all parameters in the constructor.
-    
-    Signed-off-by: Daniel d'Andrada <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit d568a6c0626eeef038753f207f234037bbbb26e4
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Feb 3 17:21:22 2012 -0800
-
-    Ship conf files
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 50cd80649cd09800a245754bb7621de777026022
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Feb 3 17:20:10 2012 -0800
-
-    Add defines.h to the list of source files
-    
-    This ensures the header is shipped in the dist tarball.
-    
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 24fbaa20c179ce4b4d9be9627bb41daffc91527a
-Author: Jussi Pakkanen <[e-mail]>
-Date:   Thu Feb 2 14:36:32 2012 +0200
-
-    Fix build system.
-    
-    The project could not be built from scratch due to erroneous
-    Autofoo setup. This commit makes it work.
-    
-    Signed-off-by: Jussi Pakkanen <[e-mail]>
-    Reviewed-by: Chase Douglas <[e-mail]>
-    Signed-off-by: Chase Douglas <[e-mail]>
-
-commit 79b2d4e7f976621705bd32a9fd16e56c989a5a45
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Feb 1 11:12:29 2012 -0800
-
-    And by default point to a location that doesn't require root privileges to be used.
-    
-    This will make it possible to run Xorg without being root.
-    
-    Signed-off-by: Daniel d'Andrada <[e-mail]>
-
-commit 656d8b22be42b23d5336a85173d7381bf115a327
-Merge: 37906b3 e5f21a6
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 21 08:30:43 2011 -0800
-
-    Merge some miscellaneous fixes
-
-commit e5f21a67393a5db4d91f07f87a649ec38d27fcc7
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 21 08:09:22 2011 -0800
-
-    Use "make doc" to build all documentation
-    
-    And clean up doc/Makefile.am targets.
-
-commit 739e52c343cdd412c0c4e9e21dd79be25b3027ca
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 21 07:51:51 2011 -0800
-
-    Rename xorg_gtest_example to xorg-gtest-example
-
-commit c63e0369cc4c7db7ffe3109b6ea8ff478ac4ba91
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 21 07:51:10 2011 -0800
-
-    Install man pages too
-
-commit c276dc0ac292d54ffc00dcab83ce7cc056c6c3df
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 21 07:49:58 2011 -0800
-
-    Start the so library version at 0.0.0
-
-commit 37906b3c6431e470a07bbf5fd26784f5116b141c
-Merge: 67c98e9 5f10cf0
-Author: Thomas Voß <[e-mail]>
-Date:   Fri Dec 16 11:44:34 2011 +0100
-
-    Merged in lp:~chasedouglas/xorg-gtest/fixes.
-
-commit 67c98e96ab8ee10e2d399d1ed4fd1f20e3daffd5
-Merge: 286707f be95cf5
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:59:40 2011 -0800
-
-    Merge example documentation fixes
-
-commit 5f10cf0d7bc2492e53bba8dc2105c8a9b8445a18
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:34:01 2011 -0800
-
-    Fix gtest cpp flags
-
-commit c8a4e665b558f2e39b63bfe91a7081fc041887c2
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:18:49 2011 -0800
-
-    Use gtest lib path when checking for gtest library
-
-commit 5bbdf9fe259a3bde28192286de2a685457b49a50
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:11:25 2011 -0800
-
-    Use Process::SetEnv() in Environment::SetUp()
-
-commit 327d46a503ab1f57134e9d3a56f6792b151e8c03
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:10:59 2011 -0800
-
-    Make Process::GetEnv and SetEnv static methods
-    
-    They do not modify or use a Process object. They are merely helper
-    functions.
-
-commit 8b2947df181dba16e07bd399d33ef0ae60aebdeb
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:01:39 2011 -0800
-
-    Move SetUp and TearDown methods to protected sections
-
-commit 7b18bcffa98443e736dbfde2848698f5e6d6efa9
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 11:00:13 2011 -0800
-
-    Don't install Doxyfile
-
-commit e51bcee92edeb7f3da577f9f2da2b6ecb96d17d4
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 10:54:33 2011 -0800
-
-    Only install documentation if it was created
-
-commit d5df40d00c6729dfdf1504d50f3658d3de22c5f5
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 10:38:44 2011 -0800
-
-    Remove leftover geistest doc line in doc/Makefile.am
-
-commit 286707f7a39ce7daa753994f35776ff2f273f07e
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 10:29:22 2011 -0800
-
-    Don't link gtest when creating library
-
-commit be95cf5f4fccaf6393ac65f3c3f9254acfd8ee17
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 09:27:07 2011 -0800
-
-    Include examples directory when scanning for documented sources
-
-commit 42d3e9d818d4827ae001c50dd190fd477ffce593
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 09:21:30 2011 -0800
-
-    Remove license header from example
-    
-    It clutters up the example and is unnecessary for such a small file.
-
-commit 6f0204791b3057ad49719675f30810c1b2755aff
-Merge: bb34e85 2e13892
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 09:13:34 2011 -0800
-
-    Merge in Doxygen branch, which also includes many fixes
-
-commit bb34e8586f1d74e4717dc8300bea6628b9a38804
-Merge: 4ee62b3 5b07f09
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 14 08:25:54 2011 -0800
-
-    Merge gtest configure check fixes
-
-commit 2e13892e9031e10dc91a2677295be654eb6b7747
-Author: Thomas Voß <[e-mail]>
-Date:   Wed Dec 14 16:19:03 2011 +0100
-
-    Introduced examples. Added virtual d'tors to xorg::testing::Environment and xorg::testing::Test.
-
-commit 5b07f09f0713b670070e4d44ada2aeab3f6e883c
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Dec 13 17:30:48 2011 -0800
-
-    Use AC_LANG_PUSH(C++)/AC_LANG_POP so as not to contaminate configure.ac
-
-commit 9a493fa6cbaa61582092b2484ab2cf95edcc8dcf
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Dec 13 17:21:24 2011 -0800
-
-    Link against pthread when checking for gtest library
-
-commit 9b93e8df1f350fd1fc3cd0888c0bf565bf3e18f0
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Dec 13 17:02:48 2011 -0800
-
-    Move check result test to configure.ac and use standard variables
-
-commit 41d0b41fc5b244438af787de687a4b341889cadc
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Dec 13 16:49:08 2011 -0800
-
-    Remove unnecessary HAVE_GTEST conditional in configure.ac
-
-commit 0ada1132294813196503527124d321093cb36e7f
-Author: Chase Douglas <[e-mail]>
-Date:   Tue Dec 13 16:48:37 2011 -0800
-
-    Make gtest a requirement for successful configuration
-    
-    And switch to the non-deprecated AC_CHECK_LIB.
-
-commit 69569cba1db0c17ae04d5c26c62fd02fa6473191
-Author: Thomas Voß <[e-mail]>
-Date:   Tue Dec 13 18:33:39 2011 +0100
-
-    Adjusted signature of Process::GetEnv. Adjusted documentation.
-
-commit 78ac5be868fd1e1d31300a61f8e425736c586b58
-Author: Thomas Voß <[e-mail]>
-Date:   Tue Dec 13 10:15:24 2011 +0100
-
-    Fixed typo in test.h.
-
-commit 8ace60ed7cc70589de26ec3e5e409588a0f0bd00
-Author: Thomas Voß <[e-mail]>
-Date:   Tue Dec 13 10:08:09 2011 +0100
-
-    Modified Process::Terminate and Process::Kill to reset process identifier. Adjusted documentation.
-
-commit 932bf1ec03ed9160c9784fdbb7f3a9456a5beb50
-Author: Thomas Voß <[e-mail]>
-Date:   Tue Dec 13 10:00:07 2011 +0100
-
-    Adjusted documentation according to review. Switched to std::string for environment query/adjustment in Process.
-
-commit 07ffdc1266c3c3d7c5d2df56666567777fd54050
-Author: Thomas Voß <[e-mail]>
-Date:   Tue Dec 13 07:37:37 2011 +0100
-
-    Prevent from linking Test in Google Test. Set HIDE_SCOPE_NAMES to NO.
-
-commit 4ee62b348d2346e03b6cbbfd94f710eda499d011
-Merge: bd17c14 934da76
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 12 11:28:13 2011 -0800
-
-    Merge cleanup and fixes branch
-
-commit bb43c8271894e29a5818fadacde9bb459a55e6e1
-Author: Thomas Voß <[e-mail]>
-Date:   Mon Dec 12 09:44:51 2011 +0100
-
-    Referenced manpage of execvp in documentation.
-
-commit 6383f42858833f9695580f365352df30f4e33fb2
-Author: Thomas Voß <[e-mail]>
-Date:   Mon Dec 12 09:31:21 2011 +0100
-
-    Fixed whitespace issue.
-
-commit e7ea9a0717b58af7aaf9728862df424c84e58b77
-Merge: f815612 934da76
-Author: Thomas Voß <[e-mail]>
-Date:   Mon Dec 12 09:22:17 2011 +0100
-
-    Added: Additional doxygen documentation and adjusted build setup to include docs.
-
-commit 934da7636d0cc811600c2dd73c6cd386f0851e25
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Dec 9 13:03:46 2011 -0800
-
-    Throw runtime_error if Test::SetUp fails to open connection to server
-    
-    gtest treats exceptions as test failures, so this should have the same
-    result but is a cleaner implementation.
-
-commit c0b553ebe1be0bf4c2ebffc1582a0e07f40aaa5a
-Author: Chase Douglas <[e-mail]>
-Date:   Fri Dec 9 12:09:28 2011 -0800
-
-    Add initializer for Environment::Private struct since it is not a POD
-
-commit f815612acc574081880c62b64ba803f5305b8bc5
-Author: Thomas Voß <[e-mail]>
-Date:   Fri Dec 9 09:58:35 2011 +0100
-
-    Added doxygen documentation for public interface classes.
-
-commit ef3e43e4edba9577097430bed545ad4c7dca3fb8
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 15:07:53 2011 -0800
-
-    Remove strdup from argument parsing in Process::Start()
-    
-    The data pointed to by the args should still be valid. There's no real
-    need to copy the data.
-
-commit 330dfc09ecc78cfd91a93ed5d41f31f0341e81a1
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 15:00:25 2011 -0800
-
-    Use std::vector to store process arguments passed to execvp
-
-commit 3eda6c1380ab4bdfaf891d6d20097dc83dac8e65
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 14:20:53 2011 -0800
-
-    Use std::auto_ptr for Test pimpl too
-
-commit 826c9bbf23fd5650cd2ca0e3314e4e8559b1061e
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 14:09:23 2011 -0800
-
-    Use C++ headers, such as cstring, instead of C-compatibility headers
-
-commit 1bc40ffa16a3986d901bf602fcf17504afdf6cfc
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 14:02:26 2011 -0800
-
-    Remove obsolete Process::SetEnvBehavior enum
-
-commit 6757be79645ba5a4e582e010934d1ef908896e9d
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 13:59:34 2011 -0800
-
-    Use std::auto_ptr for pimpls
-
-commit 3ddfc3d8b1dd8a99126faa2eb05687eb08c279fb
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 13:51:17 2011 -0800
-
-    Add newlines to end of Environment::TearDown() error messages
-
-commit ad2cdf9b4daf3193dc852342153719817c8b1fc0
-Author: Chase Douglas <[e-mail]>
-Date:   Thu Dec 8 13:50:11 2011 -0800
-
-    In Environment::SetUp, pass std::string into Process::Start
-
-commit dc354884d529bf6060a6a1537339527ad70d80a7
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 15:34:30 2011 -0800
-
-    Fix a couple usages of C++ line comments
-    
-    C++ line comments are only used for documenting end of namespace scopes
-    and #endif macros.
-
-commit 016ff9329130266f10edd7f4828bf22e59a8c97f
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 14:46:28 2011 -0800
-
-    Add xorg::testing::Test base test fixture
-
-commit 3aea1bbbbb7f7ab8a76cdbfc110fa9c5ed14ae25
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:38:04 2011 -0800
-
-    Add server executable path option so one can test different servers
-    
-    Also, fix issues with the main option parsing code.
-
-commit 4f083dd6a3ea2473913d23aecf4d06f664f95bce
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:40:30 2011 -0800
-
-    Reorder Process copy constructor declarations
-
-commit 8fe2c7c8bfc167c577674273f462f2d7c7a1a9fa
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:27:12 2011 -0800
-
-    Fix comment in environment.h
-
-commit 3d4a10a0280ed3320ed221e33595623af8d20150
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:26:25 2011 -0800
-
-    Cleanup unnecessary braces in if .. else blocks in Environment::SetUp()
-
-commit 4348b83156925eee6f2cbdca24a2473ebfd90c9f
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:24:59 2011 -0800
-
-    Don't fail the tests if the X server refuses to die
-
-commit e97811a1be63c97706fe3ca87a0568eb5a585a08
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:15:08 2011 -0800
-
-    Let setenv() and getenv() do error handling, and throw exception if they
-    fail
-
-commit bd446fb14847d6ab4d6531fb39309eea58aac4df
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:09:04 2011 -0800
-
-    Throw exception if child process tries to kill itself
-
-commit f052b71de4ab05158b2b239d9d31d64e0aad76a4
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:05:26 2011 -0800
-
-    Remove Process::Wait()
-    
-    There are many ways to wait on the status of a process. We don't want to
-    get into wrapping all of them. Let the caller pick and choose from the
-    c library.
-
-commit 723704879e551b971e1e3504be7338e371d4981d
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 12:02:05 2011 -0800
-
-    Rename Process::pid() to Process::Pid() to follow naming conventions
-
-commit 2a3c526f6f6d1e32a4f51bef557a26520fe01ef7
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 11:58:20 2011 -0800
-
-    Fix Process::Start() and switch to using exceptions
-
-commit 737e0bc858cb741407c24fc8597bd98f3c15a271
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 09:01:57 2011 -0800
-
-    Switch Process::Private to a POD struct
-    
-    Some other syntax cleanups too.
-
-commit c182eb93570139e18f8eeb3144e9ed5ccf3a3252
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 08:50:50 2011 -0800
-
-    Re-enable X server startup timeout
-
-commit eba6481ae557d05da0b151087a090d00496d1aa2
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 08:50:06 2011 -0800
-
-    Remove dead code in Environment
-
-commit 204cfd5c09eb1b40059d49b9864ee0f584630a4c
-Author: Chase Douglas <[e-mail]>
-Date:   Wed Dec 7 08:47:56 2011 -0800
-
-    Make Environment::Private a POD struct
-
-commit 9c003eb98bc41d196847ab911d9d155c5a7972a4
-Author: Thomas Voß <[e-mail]>
-Date:   Wed Dec 7 15:34:53 2011 +0100
-
-    ADDED: Simple and lightweight class to abstract process handling.
-
-commit bd17c146ff4a159393ec37f1300c613d40921bbf
-Merge: 1ff7a96 7777cbb
-Author: Thomas Voß <[e-mail]>
-Date:   Tue Dec 6 11:16:25 2011 +0100
-
-    Merged.
-
-commit 7777cbbbd16d428d68fc738a946816edcb718654
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 16:25:36 2011 -0800
-
-    Use installed dummy.conf location
-    
-    Also, set the location in the pkg-config file so other packages can find
-    it.
-
-commit ad0ef22400f1b9960e15e0f6fe39b3e95701f21e
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 16:02:22 2011 -0800
-
-    Rename testing::xorg to xorg::testing
-    
-    Prevents a possible collision with gtest's testing namespace
-
-commit e10564038f99adee0a12cb028cac5bd1610d7b40
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 11:32:36 2011 -0800
-
-    Remove unused fixture.h
-
-commit 4a1d0ed99f929b658e726f83e4ded4cc5e21aabc
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 11:32:04 2011 -0800
-
-    Add pkg-config file
-
-commit 9fc1496d5a10266337773daff2b3d9937fbf8cf1
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 10:54:49 2011 -0800
-
-    Remove unused gcov support
-
-commit e1d5b252f4c09ee52380a7b7b7533a9b7c382975
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 10:53:37 2011 -0800
-
-    Remove autoconf check for C compiler since we only use C++
-
-commit f4706dc1c47eb59bda619dc105a0e6e9f0a81a21
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 10:49:52 2011 -0800
-
-    Init gtest before checking for special args so --help works properly
-    
-    Otherwise, it's impossible to list the gtest help list.
-
-commit 26cdf7ae0eb8477b2c8afa97d3857d8810de3d99
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 10:47:31 2011 -0800
-
-    Remove unnecessary c++0x std flag
-    
-    We can add it back in if we actually use any of its features.
-
-commit d401f679f3e9161bbb06ce33bf48678c74329cd0
-Author: Chase Douglas <[e-mail]>
-Date:   Mon Dec 5 10:46:07 2011 -0800
-
-    Rename to xorg-gtest, move some files around, make some fixes
-
-commit 1ff7a967e0648d6f71bf3bc30e3642431765da7e
-Author: Thomas Voß <[e-mail]>
-Date:   Mon Dec 5 17:27:29 2011 +0100
-
-    init checkin.

=== modified file 'Makefile.am'
--- Makefile.am	2012-03-19 18:39:04 +0000
+++ Makefile.am	2013-01-21 00:48:20 +0000
@@ -23,7 +23,7 @@
 # SOFTWARE.
 #
 
-SUBDIRS = aclocal data doc include src examples
+SUBDIRS = aclocal data doc include src examples test gtest
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-gtest.pc

=== modified file 'Makefile.in'
--- Makefile.in	2012-03-19 18:39:04 +0000
+++ Makefile.in	2013-01-21 00:48:20 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,6 +41,23 @@
 #
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -65,7 +82,7 @@
 	$(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
 	config.sub depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -89,6 +106,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -160,8 +182,8 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -177,6 +199,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CPPFLAGS = @BASE_CPPFLAGS@
 BASE_CXXFLAGS = @BASE_CXXFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPPFLAGS = @CPPFLAGS@
@@ -188,6 +211,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DUMMY_CONF_PATH = @DUMMY_CONF_PATH@
@@ -201,8 +225,6 @@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
-GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
-GTEST_SOURCE = @GTEST_SOURCE@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -214,6 +236,7 @@
 LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LOGFILE_DIR = @LOGFILE_DIR@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -241,10 +264,10 @@
 STRICT_CXXFLAGS = @STRICT_CXXFLAGS@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
 XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
-XSERVER_CFLAGS = @XSERVER_CFLAGS@
-XSERVER_LIBS = @XSERVER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -295,7 +318,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = aclocal data doc include src examples
+SUBDIRS = aclocal data doc include src examples test gtest
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-gtest.pc
 ACLOCAL_AMFLAGS = -I m4
@@ -342,8 +365,11 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -528,13 +554,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -597,7 +620,6 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
@@ -623,7 +645,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)

=== modified file 'README'
--- README	2012-03-19 18:39:04 +0000
+++ README	2013-01-21 00:48:20 +0000
@@ -2,10 +2,9 @@
 ===============================================
 
 Provides a Google Test environment for starting and stopping
-a dummy X server for headless testing purposes. The actual 
-environment is defined in header environment.h. Please refer to
-the Google test documentation for information on how to add a custom 
-environment.
+a X server for testing purposes. The actual environment is defined in header
+environment.h. Please refer to the Google test documentation for information
+on how to add a custom environment.
 
 Moreover, a custom main() function that takes care of setting up the
 environment is provided in xorg-gtest_main.cpp. This can be used as a
@@ -74,3 +73,19 @@
 xorg-gtest library targets if multiple builds with different compilation flags
 are needed. Finally, link the tests with the appropriate gtest and xorg-gtest
 libraries and their dependencies: libpthread and libX11.
+
+Environment variables
+---------------------
+XORG_GTEST_XSERVER_SIGSTOP
+  If set, an XServer object will raise a SIGSTOP signal after startup.
+XORG_GTEST_XSERVER_KEEPALIVE
+  If set, the XServer object will ignore calls to Terminate() or Kill().
+  This is useful for debugging a server without having the test terminate
+  the process while still looking at gdb output.
+XORG_GTEST_CHILD_STDOUT
+  If set to any value, Process::Start() will _not_ close stdout/stdin/stderr
+  for the forked child.
+XORG_GTEST_USE_VALGRIND
+  Set to the valgrind command to use when starting a process. Options must
+  be space-separated, e.g. "valgrind --leak-check=full --someotherarg"
+  Not limited to valgrind, you can specify any executable here.

=== modified file 'aclocal.m4'
--- aclocal.m4	2012-03-19 18:39:04 +0000
+++ aclocal.m4	2013-01-21 00:48:20 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 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'.])])
@@ -2051,7 +2051,7 @@
 [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.3], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2067,7 +2067,7 @@
 # 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.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -3079,4 +3079,4 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/gtest.m4])
+m4_include([m4/ac_define_dir.m4])

=== modified file 'aclocal/Makefile.in'
--- aclocal/Makefile.in	2012-03-19 18:39:04 +0000
+++ aclocal/Makefile.in	2013-01-21 00:48:20 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,6 +41,23 @@
 #
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,7 +80,7 @@
 DIST_COMMON = $(dist_aclocal_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -78,6 +95,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -119,6 +141,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CPPFLAGS = @BASE_CPPFLAGS@
 BASE_CXXFLAGS = @BASE_CXXFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPPFLAGS = @CPPFLAGS@
@@ -130,6 +153,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DUMMY_CONF_PATH = @DUMMY_CONF_PATH@
@@ -143,8 +167,6 @@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
-GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
-GTEST_SOURCE = @GTEST_SOURCE@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -156,6 +178,7 @@
 LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LOGFILE_DIR = @LOGFILE_DIR@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -183,10 +206,10 @@
 STRICT_CXXFLAGS = @STRICT_CXXFLAGS@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
 XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
-XSERVER_CFLAGS = @XSERVER_CFLAGS@
-XSERVER_LIBS = @XSERVER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -274,8 +297,11 @@
 $(am__aclocal_m4_deps):
 install-dist_aclocalDATA: $(dist_aclocal_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(aclocaldir)"
 	@list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \

=== modified file 'aclocal/xorg-gtest.m4'
--- aclocal/xorg-gtest.m4	2012-06-08 12:39:52 +0000
+++ aclocal/xorg-gtest.m4	2013-01-21 00:48:20 +0000
@@ -1,4 +1,4 @@
-# serial 2
+# serial 9
 
 # Copyright (C) 2012 Canonical, Ltd.
 #
@@ -21,35 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# Checks whether the gtest source is available on the system. Allows for
-# adjusting the include and source path. Sets have_gtest=yes if the source is
-# present. Sets GTEST_CPPFLAGS and GTEST_SOURCE to the preprocessor flags and
-# source location respectively.
-AC_DEFUN([_CHECK_GTEST],
-[
-  AC_ARG_WITH([gtest-source-path],
-              [AS_HELP_STRING([--with-gtest-source-path],
-                              [location of the Google test sources, defaults to /usr/src/gtest])],
-              [GTEST_SOURCE="$withval"; GTEST_CPPFLAGS="-I$withval/include"],
-              [GTEST_SOURCE="/usr/src/gtest"])
-
-  AC_ARG_WITH([gtest-include-path],
-              [AS_HELP_STRING([--with-gtest-include-path],
-                              [location of the Google test headers])],
-              [GTEST_CPPFLAGS="-I$withval"])
-
-  GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE"
-
-  AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
-                 [$GTEST_SOURCE/src/gtest_main.cc],
-                 [have_gtest=yes],
-                 [have_gtest=no])
-
-  AS_IF([test "x$have_gtest_source" = xyes],
-        [AC_SUBST(GTEST_CPPFLAGS)]
-        [AC_SUBST(GTEST_SOURCE)])
-]) # _CHECK_GTEST
-
 # CHECK_XORG_GTEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 #
 # Checks whether the xorg-gtest source is available on the system. Allows for
@@ -61,20 +32,20 @@
 # Both default actions are no-ops.
 AC_DEFUN([CHECK_XORG_GTEST],
 [
-  AC_REQUIRE([_CHECK_GTEST])
-
   PKG_CHECK_EXISTS([xorg-gtest],
                    [have_xorg_gtest=yes],
                    [have_xorg_gtest=no])
 
   XORG_GTEST_SOURCE=`$PKG_CONFIG --variable=sourcedir --print-errors xorg-gtest`
+  GTEST_SOURCE="$XORG_GTEST_SOURCE/src/gtest"
+  GTEST_CPPFLAGS="-I$XORG_GTEST_SOURCE/src/gtest/include -I$XORG_GTEST_SOURCE/src/gtest"
   XORG_GTEST_CPPFLAGS=`$PKG_CONFIG --variable=CPPflags --print-errors xorg-gtest`
   XORG_GTEST_CPPFLAGS="$GTEST_CPPFLAGS $XORG_GTEST_CPPFLAGS"
   XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -I$XORG_GTEST_SOURCE"
 
   PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no])
 
-  # Check if we should include support for utouch-evemu
+  # Check if we should include support for evemu
   AC_ARG_WITH([evemu],
               [AS_HELP_STRING([--with-evemu],
                               [support Linux input device recording playback
@@ -83,19 +54,18 @@
               [with_evemu=check])
 
   AS_IF([test "x$with_evemu" = xyes],
-        [PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])],
+        [PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])],
         [test "x$with_evemu" = xcheck],
         [PKG_CHECK_MODULES(EVEMU,
-                           [utouch-evemu],
+                           [evemu],
                            [have_xorg_gtest_evemu=yes],
                            [have_xorg_gtest_evemu=no])])
   AS_IF([test "x$have_xorg_gtest_evemu" = xyes],
         [XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -DHAVE_EVEMU"])
 
-  AS_IF([test "x$have_gtest" != xyes -o "x$have_x11" != xyes],
-        [have_xorg_gtest=no])
-
   AS_IF([test "x$have_xorg_gtest" = xyes],
+        [AC_SUBST(GTEST_SOURCE)]
+        [AC_SUBST(GTEST_CPPFLAGS)]
         [AC_SUBST(XORG_GTEST_SOURCE)]
         [AC_SUBST(XORG_GTEST_CPPFLAGS)]
 

=== removed file 'autogen.sh'
--- autogen.sh	2012-02-15 09:18:17 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-

=== modified file 'config.sub'
--- config.sub	2012-02-24 09:44:47 +0000
+++ config.sub	2013-01-21 00:48:20 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -225,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -1537,6 +1543,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;

=== modified file 'configure'
--- configure	2012-06-08 12:39:52 +0000
+++ configure	2013-01-21 00:48:20 +0000
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Dummy X.org Testing Environment for Google Test 0.3.0.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Generated by GNU Autoconf 2.69 for X.org Testing Environment for Google Test 0.7.0.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -555,10 +575,10 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='Dummy X.org Testing Environment for Google Test'
+PACKAGE_NAME='X.org Testing Environment for Google Test'
 PACKAGE_TARNAME='xorg-gtest'
-PACKAGE_VERSION='0.3.0'
-PACKAGE_STRING='Dummy X.org Testing Environment for Google Test 0.3.0'
+PACKAGE_VERSION='0.7.0'
+PACKAGE_STRING='X.org Testing Environment for Google Test 0.7.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -605,16 +625,19 @@
 LIBOBJS
 ENABLE_XORG_GTEST_TESTS_FALSE
 ENABLE_XORG_GTEST_TESTS_TRUE
-DUMMY_CONF_PATH
+BASE_CPPFLAGS
 SOURCEDIR
 HAVE_EVEMU_FALSE
 HAVE_EVEMU_TRUE
 EVEMU_LIBS
 EVEMU_CFLAGS
-GTEST_SOURCE
-GTEST_CPPFLAGS
-XSERVER_LIBS
-XSERVER_CFLAGS
+DUMMY_CONF_PATH
+LOGFILE_DIR
+X11_LIBS
+X11_CFLAGS
+HAVE_DOXYGEN_FALSE
+HAVE_DOXYGEN_TRUE
+DOXYGEN
 ENABLE_INTEGRATION_TESTS_FALSE
 ENABLE_INTEGRATION_TESTS_TRUE
 XORG_MALLOC_DEBUG_ENV
@@ -747,8 +770,8 @@
 enable_strict_compilation
 enable_silent_rules
 enable_integration_tests
-with_gtest_source_path
-with_gtest_include_path
+with_doxygen
+with_logfile_dir
 with_evemu
 '
       ac_precious_vars='build_alias
@@ -765,8 +788,9 @@
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 XORG_MALLOC_DEBUG_ENV
-XSERVER_CFLAGS
-XSERVER_LIBS
+DOXYGEN
+X11_CFLAGS
+X11_LIBS
 EVEMU_CFLAGS
 EVEMU_LIBS'
 
@@ -1224,8 +1248,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1311,7 +1333,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Dummy X.org Testing Environment for Google Test 0.3.0 to adapt to many kinds of systems.
+\`configure' configures X.org Testing Environment for Google Test 0.7.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1381,7 +1403,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Dummy X.org Testing Environment for Google Test 0.3.0:";;
+     short | recursive ) echo "Configuration of X.org Testing Environment for Google Test 0.7.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1408,11 +1430,10 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gtest-source-path
-                          location of the Google test sources, defaults to
-                          /usr/src/gtest
-  --with-gtest-include-path
-                          location of the Google test headers
+  --with-doxygen          Use doxygen to regenerate documentation (default:
+                          auto)
+  --with-logfile-dir=/tmp ,
+                          Base path for log files used as defaults and during tests (default: /tmp)
   --with-evemu            support Linux input device recording playback
                           (default: enabled if available)
 
@@ -1432,10 +1453,9 @@
               path overriding pkg-config's built-in search path
   XORG_MALLOC_DEBUG_ENV
               Environment variables to enable memory checking in tests
-  XSERVER_CFLAGS
-              C compiler flags for XSERVER, overriding pkg-config
-  XSERVER_LIBS
-              linker flags for XSERVER, overriding pkg-config
+  DOXYGEN     Path to doxygen command
+  X11_CFLAGS  C compiler flags for X11, overriding pkg-config
+  X11_LIBS    linker flags for X11, overriding pkg-config
   EVEMU_CFLAGS
               C compiler flags for EVEMU, overriding pkg-config
   EVEMU_LIBS  linker flags for EVEMU, overriding pkg-config
@@ -1506,10 +1526,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Dummy X.org Testing Environment for Google Test configure 0.3.0
-generated by GNU Autoconf 2.68
+X.org Testing Environment for Google Test configure 0.7.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1741,7 +1761,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1759,99 +1779,12 @@
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Dummy X.org Testing Environment for Google Test $as_me 0.3.0, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by X.org Testing Environment for Google Test $as_me 0.7.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2270,7 +2203,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2439,7 +2372,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2479,7 +2412,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2530,7 +2463,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2583,7 +2516,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2669,7 +2602,7 @@
 
 # Define the identity of the package.
  PACKAGE='xorg-gtest'
- VERSION='0.3.0'
+ VERSION='0.7.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2762,7 +2695,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2806,7 +2739,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3449,7 +3382,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3489,7 +3422,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3695,7 +3628,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3761,7 +3694,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3992,7 +3925,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4035,7 +3968,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4178,7 +4111,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4685,7 +4618,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Wformat=2" >&5
 $as_echo_n "checking if $CXX supports-Wformat=2... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Wformat=2" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Wformat_2
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5694,7 +5627,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=implicit" >&5
 $as_echo_n "checking if $CXX supports-Werror=implicit... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=implicit" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_implicit
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5743,7 +5676,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
 $as_echo_n "checking if $CXX supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5861,7 +5794,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=nonnull" >&5
 $as_echo_n "checking if $CXX supports-Werror=nonnull... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=nonnull" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_nonnull
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5979,7 +5912,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=init-self" >&5
 $as_echo_n "checking if $CXX supports-Werror=init-self... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=init-self" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_init_self
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6097,7 +6030,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=main" >&5
 $as_echo_n "checking if $CXX supports-Werror=main... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=main" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_main
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6215,7 +6148,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=missing-braces" >&5
 $as_echo_n "checking if $CXX supports-Werror=missing-braces... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=missing-braces" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_missing_braces
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6333,7 +6266,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=sequence-point" >&5
 $as_echo_n "checking if $CXX supports-Werror=sequence-point... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=sequence-point" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_sequence_point
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6451,7 +6384,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=return-type" >&5
 $as_echo_n "checking if $CXX supports-Werror=return-type... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=return-type" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_return_type
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6500,7 +6433,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
 $as_echo_n "checking if $CXX supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-errwarn=E_FUNC_HAS_NO_RETURN_STMT" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6618,7 +6551,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=trigraphs" >&5
 $as_echo_n "checking if $CXX supports-Werror=trigraphs... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=trigraphs" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_trigraphs
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6736,7 +6669,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=array-bounds" >&5
 $as_echo_n "checking if $CXX supports-Werror=array-bounds... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=array-bounds" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_array_bounds
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6854,7 +6787,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=write-strings" >&5
 $as_echo_n "checking if $CXX supports-Werror=write-strings... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=write-strings" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_write_strings
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6972,7 +6905,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=address" >&5
 $as_echo_n "checking if $CXX supports-Werror=address... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=address" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_address
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7090,7 +7023,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=int-to-pointer-cast" >&5
 $as_echo_n "checking if $CXX supports-Werror=int-to-pointer-cast... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=int-to-pointer-cast" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_int_to_pointer_cast
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7139,7 +7072,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5
 $as_echo_n "checking if $CXX supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-errwarn=E_BAD_PTR_INT_COMBINATION" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__errwarn_E_BAD_PTR_INT_COMBINATION
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7257,7 +7190,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=pointer-to-int-cast" >&5
 $as_echo_n "checking if $CXX supports-Werror=pointer-to-int-cast... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=pointer-to-int-cast" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_pointer_to_int_cast
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9227,7 +9160,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=attributes" >&5
 $as_echo_n "checking if $CXX supports-Werror=attributes... " >&6; }
-		cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=attributes" | $as_tr_sh`
+		cacheid=xorg_cv_cxx_flag__Werror_attributes
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9539,20 +9472,145 @@
 
 
 
+
+
+# Check whether --with-doxygen was given.
+if test "${with_doxygen+set}" = set; then :
+  withval=$with_doxygen; use_doxygen=$withval
+else
+  use_doxygen=auto
+fi
+
+
+
+if test "x$use_doxygen" = x"auto"; then
+   # Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DOXYGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$DOXYGEN" = "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - documentation targets will be skipped" >&5
+$as_echo "$as_me: WARNING: doxygen not found - documentation targets will be skipped" >&2;}
+	have_doxygen=no
+   else
+        have_doxygen=yes
+   fi
+elif test "x$use_doxygen" = x"yes" ; then
+   # Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DOXYGEN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$DOXYGEN" = "x"; then
+        as_fn_error $? "--with-doxygen=yes specified but doxygen not found in PATH" "$LINENO" 5
+   fi
+   have_doxygen=yes
+elif test "x$use_doxygen" = x"no" ; then
+   if test "x$DOXYGEN" != "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&2;}
+   fi
+   have_doxygen=no
+else
+   as_fn_error $? "--with-doxygen expects 'yes' or 'no'" "$LINENO" 5
+fi
+
+ if test "$have_doxygen" = yes; then
+  HAVE_DOXYGEN_TRUE=
+  HAVE_DOXYGEN_FALSE='#'
+else
+  HAVE_DOXYGEN_TRUE='#'
+  HAVE_DOXYGEN_FALSE=
+fi
+
+
+
+
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVER" >&5
-$as_echo_n "checking for XSERVER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
+$as_echo_n "checking for X11... " >&6; }
 
-if test -n "$XSERVER_CFLAGS"; then
-    pkg_cv_XSERVER_CFLAGS="$XSERVER_CFLAGS"
+if test -n "$X11_CFLAGS"; then
+    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xi\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xi") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XSERVER_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
+  pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11 xi" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9560,16 +9618,16 @@
  else
     pkg_failed=untried
 fi
-if test -n "$XSERVER_LIBS"; then
-    pkg_cv_XSERVER_LIBS="$XSERVER_LIBS"
+if test -n "$X11_LIBS"; then
+    pkg_cv_X11_LIBS="$X11_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xi\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xi") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XSERVER_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
+  pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11 xi" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -9590,22 +9648,22 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 xi" 2>&1`
         else
-	        XSERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 xi" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$XSERVER_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (x11) were not met:
-
-$XSERVER_PKG_ERRORS
+	echo "$X11_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (x11 xi) were not met:
+
+$X11_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables XSERVER_CFLAGS
-and XSERVER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables X11_CFLAGS
+and X11_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -9616,137 +9674,49 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables XSERVER_CFLAGS
-and XSERVER_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables X11_CFLAGS
+and X11_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XSERVER_CFLAGS=$pkg_cv_XSERVER_CFLAGS
-	XSERVER_LIBS=$pkg_cv_XSERVER_LIBS
+	X11_CFLAGS=$pkg_cv_X11_CFLAGS
+	X11_LIBS=$pkg_cv_X11_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
 
-# Check for Google Test
-
-
-# Check whether --with-gtest-source-path was given.
-if test "${with_gtest_source_path+set}" = set; then :
-  withval=$with_gtest_source_path; GTEST_SOURCE="$withval"; GTEST_CPPFLAGS="-I$withval/include"
-else
-  GTEST_SOURCE="/usr/src/gtest"
-fi
-
-
-
-# Check whether --with-gtest-include-path was given.
-if test "${with_gtest_include_path+set}" = set; then :
-  withval=$with_gtest_include_path; GTEST_CPPFLAGS="-I$withval"
-fi
-
-
-  GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE"
-
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  tmp_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS"
-
-  ac_fn_cxx_check_header_mongrel "$LINENO" "gtest/gtest.h" "ac_cv_header_gtest_gtest_h" "$ac_includes_default"
-if test "x$ac_cv_header_gtest_gtest_h" = xyes; then :
-
-fi
-
-
-
-  CPPFLAGS="$tmp_CPPFLAGS"
-
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-  as_ac_File=`$as_echo "ac_cv_file_$GTEST_SOURCE/src/gtest-all.cc" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTEST_SOURCE/src/gtest-all.cc" >&5
-$as_echo_n "checking for $GTEST_SOURCE/src/gtest-all.cc... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$GTEST_SOURCE/src/gtest-all.cc"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$GTEST_SOURCE/src/gtest-all.cc" | $as_tr_cpp` 1
-_ACEOF
-have_gtest_source=yes
-else
-  have_gtest_source=no
-fi
-as_ac_File=`$as_echo "ac_cv_file_$GTEST_SOURCE/src/gtest_main.cc" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTEST_SOURCE/src/gtest_main.cc" >&5
-$as_echo_n "checking for $GTEST_SOURCE/src/gtest_main.cc... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$GTEST_SOURCE/src/gtest_main.cc"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$GTEST_SOURCE/src/gtest_main.cc" | $as_tr_cpp` 1
-_ACEOF
-have_gtest_source=yes
-else
-  have_gtest_source=no
-fi
-
-
-  if test "x$ac_cv_header_gtest_gtest_h" = xyes -a \
-              "x$have_gtest_source" = xyes; then :
-  have_gtest=yes
-
-
-else
-  have_gtest=no
-fi
-
-
-if test "x$have_gtest" != xyes; then :
-  as_fn_error $? "package 'gtest' not found" "$LINENO" 5
-fi
-
-
-
-# Check if we should include support for utouch-evemu
+
+# Check whether --with-logfile-dir was given.
+if test "${with_logfile_dir+set}" = set; then :
+  withval=$with_logfile_dir; LOGFILE_DIR="$withval"
+else
+  LOGFILE_DIR="/tmp"
+fi
+
+
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+  eval ac_define_dir="\"$LOGFILE_DIR\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  LOGFILE_DIR="$ac_define_dir"
+
+
+cat >>confdefs.h <<_ACEOF
+#define LOGFILE_DIR "$ac_define_dir"
+_ACEOF
+
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+
+DUMMY_CONF_PATH='${LOGFILE_DIR}'
+
+
+# Check if we should include support for evemu
 
 # Check whether --with-evemu was given.
 if test "${with_evemu+set}" = set; then :
@@ -9756,171 +9726,82 @@
 fi
 
 
-if test "x$with_evemu" == xyes; then :
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5
-$as_echo_n "checking for EVEMU... " >&6; }
-
-if test -n "$EVEMU_CFLAGS"; then
-    pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$EVEMU_LIBS"; then
-    pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-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
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-evemu" 2>&1`
-        else
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-evemu" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$EVEMU_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (utouch-evemu) were not met:
-
-$EVEMU_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables EVEMU_CFLAGS
-and EVEMU_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables EVEMU_CFLAGS
-and EVEMU_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS
-	EVEMU_LIBS=$pkg_cv_EVEMU_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_evemu=yes
-fi
-elif test "x$with_evemu" == xcheck; then :
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5
-$as_echo_n "checking for EVEMU... " >&6; }
-
-if test -n "$EVEMU_CFLAGS"; then
-    pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$EVEMU_LIBS"; then
-    pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-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
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-evemu" 2>&1`
-        else
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-evemu" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$EVEMU_PKG_ERRORS" >&5
-
-	:
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	:
-else
-	EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS
-	EVEMU_LIBS=$pkg_cv_EVEMU_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_evemu=yes
-fi
-fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5
+$as_echo_n "checking for EVEMU... " >&6; }
+
+if test -n "$EVEMU_CFLAGS"; then
+    pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.10 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.10 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "evemu >= 1.0.10 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$EVEMU_LIBS"; then
+    pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.10 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.10 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "evemu >= 1.0.10 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+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
+	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evemu >= 1.0.10 " 2>&1`
+        else
+	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evemu >= 1.0.10 " 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$EVEMU_PKG_ERRORS" >&5
+
+	have_evemu=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_evemu=no
+else
+	EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS
+	EVEMU_LIBS=$pkg_cv_EVEMU_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_evemu=yes
+fi
+
+if test "x$with_evemu" == xyes && test "x$have_evemu" != xyes; then :
+  as_fn_error $? "package 'evemu' not found" "$LINENO" 5
+fi
+
  if test "x$have_evemu" = "xyes"; then
   HAVE_EVEMU_TRUE=
   HAVE_EVEMU_FALSE='#'
@@ -9939,6 +9820,9 @@
 DUMMY_CONF_PATH='${datarootdir}/xorg/gtest/dummy.conf'
 
 
+BASE_CPPFLAGS='$(X11_CFLAGS) $(EVEMU_CFLAGS)'
+
+
 # Check if we can build integration tests
 if test "x$enable_integration_tests" != xno; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.org server" >&5
@@ -10002,7 +9886,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile aclocal/Makefile data/Makefile doc/Makefile examples/Makefile include/Makefile src/Makefile xorg-gtest.pc"
+ac_config_files="$ac_config_files Makefile aclocal/Makefile gtest/Makefile gtest/include/Makefile data/Makefile doc/Doxyfile doc/Makefile examples/Makefile include/Makefile src/Makefile test/Makefile xorg-gtest.pc"
 
 
 cat >confcache <<\_ACEOF
@@ -10174,6 +10058,10 @@
   as_fn_error $? "conditional \"ENABLE_INTEGRATION_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_EVEMU_TRUE}" && test -z "${HAVE_EVEMU_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_EVEMU\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -10480,16 +10368,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10549,28 +10437,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -10591,8 +10467,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Dummy X.org Testing Environment for Google Test $as_me 0.3.0, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by X.org Testing Environment for Google Test $as_me 0.7.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10648,11 +10524,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Dummy X.org Testing Environment for Google Test config.status 0.3.0
-configured by $0, generated by GNU Autoconf 2.68,
+X.org Testing Environment for Google Test config.status 0.7.0
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10732,7 +10608,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -10769,11 +10645,15 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "aclocal/Makefile") CONFIG_FILES="$CONFIG_FILES aclocal/Makefile" ;;
+    "gtest/Makefile") CONFIG_FILES="$CONFIG_FILES gtest/Makefile" ;;
+    "gtest/include/Makefile") CONFIG_FILES="$CONFIG_FILES gtest/include/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+    "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "xorg-gtest.pc") CONFIG_FILES="$CONFIG_FILES xorg-gtest.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

=== modified file 'configure.ac'
--- configure.ac	2012-06-08 12:39:52 +0000
+++ configure.ac	2013-01-21 00:48:20 +0000
@@ -1,14 +1,14 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([Dummy X.org Testing Environment for Google Test],
-        [0.3.0],
+AC_INIT([X.org Testing Environment for Google Test],
+        [0.7.0],
         [],
         [xorg-gtest])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE([enable])
 
 # Checks for programs.
@@ -23,34 +23,36 @@
 XORG_MACROS_VERSION(1.17)
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_INTEGRATION_TESTS([yes])
-
-PKG_CHECK_MODULES(XSERVER, x11)
+XORG_WITH_DOXYGEN
+
+PKG_CHECK_MODULES(X11, x11 xi)
+
+AC_ARG_WITH(logfile-dir, [AS_HELP_STRING([--with-logfile-dir=/tmp]),
+                          [Base path for log files used as defaults and during tests (default: /tmp)]],
+                         [LOGFILE_DIR="$withval"], [LOGFILE_DIR="/tmp"])
+AC_DEFINE_DIR(LOGFILE_DIR, LOGFILE_DIR, [Log file path])
+AC_SUBST(DUMMY_CONF_PATH, ['${LOGFILE_DIR}'])
  
-# Check for Google Test
-CHECK_GTEST
-
-AS_IF([test "x$have_gtest" != xyes],
-      AC_MSG_ERROR([package 'gtest' not found]))
-
-AC_SUBST([GTEST_CPPFLAGS])
-
-# Check if we should include support for utouch-evemu
+# Check if we should include support for evemu
 AC_ARG_WITH([evemu],
             [AS_HELP_STRING([--with-evemu],
                             [support Linux input device recording playback (default: enabled if available)])],
             [],
             [with_evemu=check])
 
-AS_IF([test "x$with_evemu" == xyes],
-      [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes])],
-      [test "x$with_evemu" == xcheck],
-      [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes], [:])])
+PKG_CHECK_MODULES(EVEMU, [evemu >= 1.0.10] , [have_evemu=yes], [have_evemu=no])
+
+AS_IF([test "x$with_evemu" == xyes && test "x$have_evemu" != xyes],
+      AC_MSG_ERROR([package 'evemu' not found]))
+
 AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = "xyes"])
 AS_IF([test "x$have_evemu" = xyes], [AC_DEFINE([HAVE_EVEMU])])
 
 AC_SUBST(SOURCEDIR, ['${prefix}/src/xorg-gtest'])
 AC_SUBST(DUMMY_CONF_PATH, ['${datarootdir}/xorg/gtest/dummy.conf'])
 
+AC_SUBST(BASE_CPPFLAGS, ['$(X11_CFLAGS) $(EVEMU_CFLAGS)'])
+
 # Check if we can build integration tests
 AS_IF([test "x$enable_integration_tests" != xno],
       [AC_MSG_CHECKING([for X.org server])]
@@ -75,11 +77,15 @@
 
 AC_CONFIG_FILES([Makefile
                  aclocal/Makefile
+                 gtest/Makefile
+                 gtest/include/Makefile
                  data/Makefile
+                 doc/Doxyfile
                  doc/Makefile
                  examples/Makefile
                  include/Makefile
                  src/Makefile
+                 test/Makefile
                  xorg-gtest.pc])
 
 AC_OUTPUT

=== modified file 'data/Makefile'
--- data/Makefile	2012-06-08 12:39:52 +0000
+++ data/Makefile	2013-01-21 00:48:20 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # data/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,6 +41,23 @@
 #
 
 
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/xorg-gtest
 pkgincludedir = $(includedir)/xorg-gtest
 pkglibdir = $(libdir)/xorg-gtest
@@ -62,7 +79,7 @@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -77,6 +94,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -107,17 +129,18 @@
 am__installdirs = "$(DESTDIR)$(datadir)"
 DATA = $(nobase_data_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run aclocal-1.11
+ACLOCAL = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run aclocal-1.11
 ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX)
 ADMIN_MAN_SUFFIX = 8
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX)
 APP_MAN_SUFFIX = 1
-AUTOCONF = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run automake-1.11
+AUTOCONF = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run automake-1.11
 AWK = gawk
+BASE_CPPFLAGS = $(X11_CFLAGS) $(EVEMU_CFLAGS)
 BASE_CXXFLAGS =  -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wunused -Wuninitialized -Wshadow -Wcast-qual -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
 CHANGELOG_CMD = (GIT_DIR=$(top_srcdir)/.git git log > $(top_srcdir)/.changelog.tmp && mv $(top_srcdir)/.changelog.tmp $(top_srcdir)/ChangeLog) || (rm -f $(top_srcdir)/.changelog.tmp; touch $(top_srcdir)/ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 CPPFLAGS = 
@@ -127,8 +150,9 @@
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = -g -O2
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"Dummy\ X.org\ Testing\ Environment\ for\ Google\ Test\" -DPACKAGE_TARNAME=\"xorg-gtest\" -DPACKAGE_VERSION=\"0.3.0\" -DPACKAGE_STRING=\"Dummy\ X.org\ Testing\ Environment\ for\ Google\ Test\ 0.3.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"xorg-gtest\" -DVERSION=\"0.3.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DPACKAGE_VERSION_MAJOR=0 -DPACKAGE_VERSION_MINOR=3 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE__USR_SRC_GTEST_SRC_GTEST_ALL_CC=1 -DHAVE__USR_SRC_GTEST_SRC_GTEST_MAIN_CC=1 -DHAVE_EVEMU=1
+DEFS = -DPACKAGE_NAME=\"X.org\ Testing\ Environment\ for\ Google\ Test\" -DPACKAGE_TARNAME=\"xorg-gtest\" -DPACKAGE_VERSION=\"0.7.0\" -DPACKAGE_STRING=\"X.org\ Testing\ Environment\ for\ Google\ Test\ 0.7.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"xorg-gtest\" -DVERSION=\"0.7.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DPACKAGE_VERSION_MAJOR=0 -DPACKAGE_VERSION_MINOR=7 -DPACKAGE_VERSION_PATCHLEVEL=0 -DLOGFILE_DIR=\"/tmp\" -DHAVE_EVEMU=1
 DEPDIR = .deps
+DOXYGEN = /usr/bin/doxygen
 DRIVER_MAN_DIR = $(mandir)/man$(DRIVER_MAN_SUFFIX)
 DRIVER_MAN_SUFFIX = 4
 DUMMY_CONF_PATH = ${datarootdir}/xorg/gtest/dummy.conf
@@ -137,13 +161,11 @@
 ECHO_T = 
 EGREP = /bin/grep -E
 EVEMU_CFLAGS =  
-EVEMU_LIBS = -lutouch-evemu  
+EVEMU_LIBS = -levemu  
 EXEEXT = 
 FILE_MAN_DIR = $(mandir)/man$(FILE_MAN_SUFFIX)
 FILE_MAN_SUFFIX = 5
 GREP = /bin/grep
-GTEST_CPPFLAGS =  -I/usr/src/gtest
-GTEST_SOURCE = /usr/src/gtest
 INSTALL = /usr/bin/install -c
 INSTALL_CMD = (cp -f /usr/share/util-macros/INSTALL $(top_srcdir)/.INSTALL.tmp && mv $(top_srcdir)/.INSTALL.tmp $(top_srcdir)/INSTALL) || (rm -f $(top_srcdir)/.INSTALL.tmp; touch $(top_srcdir)/INSTALL; echo 'util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)
 INSTALL_DATA = ${INSTALL} -m 644
@@ -155,9 +177,10 @@
 LIBS = 
 LIB_MAN_DIR = $(mandir)/man$(LIB_MAN_SUFFIX)
 LIB_MAN_SUFFIX = 3
+LOGFILE_DIR = /tmp
 LTLIBOBJS = 
 MAINT = 
-MAKEINFO = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run makeinfo
 MAN_SUBSTS = 	-e 's|__vendorversion__|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' 	-e 's|__xorgversion__|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' 	-e 's|__xservername__|Xorg|g' 	-e 's|__xconfigfile__|xorg.conf|g' 	-e 's|__projectroot__|$(prefix)|g' 	-e 's|__apploaddir__|$(appdefaultdir)|g' 	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' 	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' 	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' 	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX)
 MISC_MAN_SUFFIX = 7
@@ -165,11 +188,11 @@
 OBJEXT = o
 PACKAGE = xorg-gtest
 PACKAGE_BUGREPORT = 
-PACKAGE_NAME = Dummy X.org Testing Environment for Google Test
-PACKAGE_STRING = Dummy X.org Testing Environment for Google Test 0.3.0
+PACKAGE_NAME = X.org Testing Environment for Google Test
+PACKAGE_STRING = X.org Testing Environment for Google Test 0.7.0
 PACKAGE_TARNAME = xorg-gtest
 PACKAGE_URL = 
-PACKAGE_VERSION = 0.3.0
+PACKAGE_VERSION = 0.7.0
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
@@ -181,15 +204,15 @@
 SOURCEDIR = ${prefix}/src/xorg-gtest
 STRICT_CXXFLAGS =  -pedantic -Werror -Werror=attributes
 STRIP = 
-VERSION = 0.3.0
+VERSION = 0.7.0
+X11_CFLAGS =  
+X11_LIBS = -lX11 -lXi  
 XORG_MALLOC_DEBUG_ENV = MALLOC_PERTURB_=15
 XORG_MAN_PAGE = X Version 11
-XSERVER_CFLAGS =  
-XSERVER_LIBS = -lX11  
-abs_builddir = /home/cndougla/Canonical/upstream/xorg-gtest/data
-abs_srcdir = /home/cndougla/Canonical/upstream/xorg-gtest/data
-abs_top_builddir = /home/cndougla/Canonical/upstream/xorg-gtest
-abs_top_srcdir = /home/cndougla/Canonical/upstream/xorg-gtest
+abs_builddir = /home/stephenw/projects/xorg-gtest/xorg-gtest/data
+abs_srcdir = /home/stephenw/projects/xorg-gtest/xorg-gtest/data
+abs_top_builddir = /home/stephenw/projects/xorg-gtest/xorg-gtest
+abs_top_srcdir = /home/stephenw/projects/xorg-gtest/xorg-gtest
 ac_ct_CXX = g++
 am__include = include
 am__leading_dot = .
@@ -216,7 +239,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/install-sh
+install_sh = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -225,7 +248,7 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -275,15 +298,18 @@
 $(am__aclocal_m4_deps):
 install-nobase_dataDATA: $(nobase_data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
 	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \
+	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2012-06-08 12:39:52 +0000
+++ data/Makefile.in	2013-01-21 00:48:20 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,6 +41,23 @@
 #
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -62,7 +79,7 @@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -77,6 +94,11 @@
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -118,6 +140,7 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CPPFLAGS = @BASE_CPPFLAGS@
 BASE_CXXFLAGS = @BASE_CXXFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPPFLAGS = @CPPFLAGS@
@@ -129,6 +152,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DUMMY_CONF_PATH = @DUMMY_CONF_PATH@
@@ -142,8 +166,6 @@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
-GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
-GTEST_SOURCE = @GTEST_SOURCE@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -155,6 +177,7 @@
 LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LOGFILE_DIR = @LOGFILE_DIR@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -182,10 +205,10 @@
 STRICT_CXXFLAGS = @STRICT_CXXFLAGS@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
 XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
-XSERVER_CFLAGS = @XSERVER_CFLAGS@
-XSERVER_LIBS = @XSERVER_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -275,15 +298,18 @@
 $(am__aclocal_m4_deps):
 install-nobase_dataDATA: $(nobase_data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
 	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \
+	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-22 11:18:40 +0000
+++ debian/changelog	2013-01-21 00:48:20 +0000
@@ -1,3 +1,14 @@
+xorg-gtest (0.7.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release (lp:  #1100382).
+  * debian/control: added valgrind as a build dependency (for tests).
+  * debian/source/format: changed to 3.0 (quilt)
+  * fixed 'make check' target so it does not fail in Ubuntu
+  * debian/control (Standards-Version): updated to 3.9.4 (no changes required)
+  * debian/copyright: updated
+
+ -- Stephen M. Webb <[e-mail]>  Fri, 18 Jan 2013 16:11:32 -0500
+
 xorg-gtest (0.3.0-0ubuntu2) quantal; urgency=low
 
   * debian/control: Depends on xserver-xorg-video-dummy, it seems required

=== modified file 'debian/control'
--- debian/control	2012-08-22 11:18:40 +0000
+++ debian/control	2013-01-21 00:48:20 +0000
@@ -9,13 +9,14 @@
                libgtest-dev,
                libtool,
                libx11-dev,
+               libxi-dev,
                pkg-config,
-               quilt,
+               valgrind,
                xserver-xorg-core,
                xserver-xorg-dev,
                xserver-xorg-video-dummy,
                xutils-dev (>= 1:7.7~1)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Section: libs
 Vcs-Git: git://anongit.freedesktop.org/~cndougla/xorg-gtest
 Vcs-Browser: http://cgit.freedesktop.org/~cndougla/xorg-gtest
@@ -25,8 +26,8 @@
 Architecture: all
 Depends: libgtest-dev,
          libxorg-gtest-data (= ${source:Version}),
+         xserver-xorg-video-dummy,
          xutils-dev (>= 1:7.7~1),
-         xserver-xorg-video-dummy,
          ${misc:Depends}
 Description: X.Org dummy testing environment for Google Test - headers
  Provides a Google Test environment for starting and stopping

=== modified file 'debian/copyright'
--- debian/copyright	2012-02-24 09:44:47 +0000
+++ debian/copyright	2013-01-21 00:48:20 +0000
@@ -1,9 +1,10 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: xorg-gtest
 Source: http://cgit.freedesktop.org/xorg/test/xorg-gtest
 
 Files: *
 Copyright: 2011-2012 Canonical Ltd.
+           2012      Red Hat, Inc.
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -18,3 +19,33 @@
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
+
+Files: gtest/*
+Copyright: 2005-2008 Google Inc
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

=== modified file 'debian/libxorg-gtest-data.install'
--- debian/libxorg-gtest-data.install	2012-06-08 12:39:52 +0000
+++ debian/libxorg-gtest-data.install	2013-01-21 00:48:20 +0000
@@ -1,2 +1,2 @@
+usr/share/X11/xorg.conf.d/99-virtual-test-devices.conf
 usr/share/xorg/gtest
-usr/share/X11/xorg.conf.d/99-virtual-test-devices.conf

=== modified file 'debian/libxorg-gtest-doc.install'
--- debian/libxorg-gtest-doc.install	2012-02-15 09:18:17 +0000
+++ debian/libxorg-gtest-doc.install	2013-01-21 00:48:20 +0000
@@ -1,2 +1,1 @@
 usr/share/doc
-usr/share/man

=== added file 'debian/patches/0001-fix-example-failures.patch'
--- debian/patches/0001-fix-example-failures.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-fix-example-failures.patch	2013-01-21 00:48:20 +0000
@@ -0,0 +1,42 @@
+Description: Fix 'make check' failures on some hardware due to timing issues.
+Author: Stephen M. Webb <[e-mail]>
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -59,7 +59,10 @@
+ TESTS = $(noinst_PROGRAMS)
+ endif
+ xorg_gtest_example_SOURCES = xorg-gtest-example.cpp
+-xorg_gtest_example_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
++xorg_gtest_example_CPPFLAGS = \
++	-I$(top_srcdir)/include \
++	$(AM_CPPFLAGS) \
++	-DDUMMY_CONF_PATH="\"$(abs_top_srcdir)/data/xorg/gtest/dummy.conf\""
+ xorg_gtest_example_LDADD = \
+                            libgtest.a \
+                            libxorg-gtest.a \
+--- a/examples/xorg-gtest-example.cpp
++++ b/examples/xorg-gtest-example.cpp
+@@ -24,6 +24,7 @@
+ TEST(XServer, StartServer) {
+   XServer server;
+   server.SetOption("-logfile", LOGFILE_DIR "/xserver-startserver.log");
++  server.SetOption("-config",  DUMMY_CONF_PATH);
+   server.Start();
+ 
+   ASSERT_EQ(server.GetState(), Process::RUNNING);
+@@ -40,6 +41,7 @@
+ TEST(XServer, DisplayConnection) {
+   XServer server;
+   server.SetOption("-logfile", LOGFILE_DIR "/xserver-display-connection.log");
++  server.SetOption("-config",  DUMMY_CONF_PATH);
+   server.Start();
+ 
+   Display *dpy = XOpenDisplay(server.GetDisplayString().c_str());
+@@ -69,6 +71,7 @@
+     log << ".log";
+ 
+     server.SetOption("-logfile", log.str());
++    server.SetOption("-config",  DUMMY_CONF_PATH);
+     server.Start();
+ 
+     /* set up Display() */

=== added file 'debian/patches/0002-fix-valgrind-test-failure.patch'
--- debian/patches/0002-fix-valgrind-test-failure.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-fix-valgrind-test-failure.patch	2013-01-21 00:48:20 +0000
@@ -0,0 +1,20 @@
+Description: Accommodate the situation in which valgrind is a wrapper script.
+Author: Stephen M. Webb <[e-mail]>
+--- a/test/process-test.cpp
++++ b/test/process-test.cpp
+@@ -355,6 +355,15 @@
+   } while(strstr(buff, program_invocation_short_name));
+ 
+   const char * arg = buff + strlen(buff) + 1;
++
++  /* accommodate the case that valgrind has a shell script wrapper */
++  if (0 == strcmp(buff, "/bin/sh")) {
++    if (0 == strcmp(arg, "-e")) {
++      arg += strlen(arg) + 1;
++    }
++    arg += strlen(arg) + 1;
++  }
++
+   std::vector<std::string>::const_iterator it = valgrind_args.begin();
+ 
+   it++; /* first one is "valgrind" */

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-24 09:44:47 +0000
+++ debian/patches/series	2013-01-21 00:48:20 +0000
@@ -1,1 +1,3 @@
 # No patches
+0001-fix-example-failures.patch
+0002-fix-valgrind-test-failure.patch

=== modified file 'debian/rules'
--- debian/rules	2012-03-19 18:39:04 +0000
+++ debian/rules	2013-01-21 00:48:20 +0000
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --parallel --with quilt,autoreconf
+	dh $@ --parallel --with autoreconf
 
 # Install xorg-gtest.pc file in architecture independent directory
 override_dh_auto_configure:
@@ -14,4 +14,4 @@
 	dh_auto_build -- all doc
 
 override_dh_install:
-	dh_install --fail-missing
+	dh_install --fail-missing -Xjquery.js

=== modified file 'debian/source/format'
--- debian/source/format	2012-02-15 09:18:17 +0000
+++ debian/source/format	2013-01-21 00:48:20 +0000
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)

=== modified file 'depcomp'
--- depcomp	2012-02-15 09:18:17 +0000
+++ depcomp	2013-01-21 00:48:20 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,8 +40,8 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -102,6 +108,12 @@
    depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
@@ -203,18 +214,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -226,10 +234,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -300,15 +317,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -344,7 +367,7 @@
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -359,9 +382,9 @@
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -407,8 +430,7 @@
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -443,11 +465,11 @@
   p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
-s/\(.*\)/	\1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
-  s/.*/	/
+  s/.*/'"$tab"'/
   G
   p
 }' >> "$depfile"
@@ -478,7 +500,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -498,15 +520,14 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -562,8 +583,7 @@
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +603,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -652,8 +672,8 @@
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;

=== removed file 'doc/Doxyfile'
--- doc/Doxyfile	2012-02-15 09:18:17 +0000
+++ doc/Doxyfile	1970-01-01 00:00:00 +0000
@@ -1,1720 +0,0 @@
-# Doxyfile 1.7.3
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = xorg-gtest
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 0.1
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Xorg testing extension to Google Test"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is 
-# included in the documentation. The maximum height of the logo should not 
-# exceed 55 pixels and the maximum width should not exceed 200 pixels. 
-# Doxygen will copy the logo to the output directory.
-
-PROJECT_LOGO           = 
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = api
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, 
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = YES
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful if your file system 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it 
-# parses. With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this 
-# tag. The format is ext=language, where ext is a file extension, and language 
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, 
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make 
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C 
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions 
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also makes the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penalty. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will roughly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespaces are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
-# will list include files with double quotes in the documentation 
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
-# will sort the (brief and detailed) documentation of class members so that 
-# constructors and destructors are listed first. If set to NO (the default) 
-# the constructors will appear in the respective orders defined by 
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a 
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen 
-# will still accept a match between prototype and implementation in such cases.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or macro consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and macros in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 0
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
-# by doxygen. The layout file controls the global structure of the generated 
-# output files in an output format independent way. The create the layout file 
-# that represents doxygen's defaults, run doxygen with the -l option. 
-# You can optionally specify a file name after the option, if omitted 
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-LAYOUT_FILE            = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = ../include \
-                         ../examples
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh 
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py 
-# *.f90 *.f *.for *.vhd *.vhdl
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.f90 \
-                         *.f \
-                         *.vhd \
-                         *.vhdl \
-                         *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix file system feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = ../examples
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty or if 
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file 
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) 
-# and it is also possible to disable source filtering for a specific pattern 
-# using *.ext= (so without naming a filter). This option only has effect when 
-# FILTER_SOURCE_FILES is enabled.
-
-FILTER_SOURCE_PATTERNS = 
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-