xrandr 1.2.3

debian/changelog

@@ -2,6 +2,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
 
   * xrdb 1.0.5
   * xset 1.0.4
+  * xrandr 1.2.3
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 07 Mar 2008 20:27:02 +0100
 

xrandr/COPYING

@@ -1,12 +1,21 @@
-This is a stub file.  This package has not yet had its complete licensing
+Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
-information compiled.  Please see the individual source files for details on
+Copyright © 2002 Hewlett Packard Company, Inc.
-your rights to use and modify this software.
+Copyright © 2006 Intel Corporation
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-All licensing questions regarding this software should be directed at the
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-Xorg mailing list:
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-http://lists.freedesktop.org/mailman/listinfo/xorg
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.

xrandr/ChangeLog

@@ -1,47 +1,890 @@
-2006-04-26  Adam Jackson  <ajax@freedesktop.org>
+commit 4450756d2d1d86f3c0bfaef81f6265f795468f32
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Sat Dec 15 00:59:00 2007 +0100
 
-	* configure.ac:
+    Clarify the ability to manipulate multiple outputs in the manpage
-	Bump to 1.0.2
 
-2006-04-25  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit 5c2a003adab4aaa979a095e18793b01cfa694bf4
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Sat Dec 15 00:49:35 2007 +0100
 
-	* xrandr.c: 
+    Allow the same output to be specified several times on the command line
-	Don't try to fprintf a NULL string when -display wasn't passed and 
+    
-	connecting to $DISPLAY failed, since that segfaults on some platforms.
+    Without this
+      xrandr --output FOO --mode 1024x768 --output FOO --rotate left
+    only changed the mode but did not apply the rotation.
+    
+    Reported by Marc Haber in
+      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455225
 
-2006-03-20  Adam Jackson  <ajax@freedesktop.org>
+commit ab5e07fdd10f6340289b786414804a034ca98f0b
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Fri Nov 30 16:13:51 2007 +0100
 
-	* xrandr.c:
+    Add another test known to fail.
-	Bug #5511, #5512: Print more sensible error messages when fed broken
-	command lines.  (Bill Crawford)
 
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 4bc84c331f4f0f0658ad1f6c0107e3e6af2a7911
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Nov 29 19:54:34 2007 +0100
 
-	* configure.ac:
+    Add informational output for known issues.
-	Update package version for X11R7 release.
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 3fb533ff896bd642200e7242c4d35a887faeca74
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Nov 29 19:54:03 2007 +0100
 
-	* configure.ac:
+    Add more tests, mostly regarding crtc switching and uncloning.
-	Update package version number for final X11R7 release candidate.
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 20c8a60950cb5b4ddef305dc9822bec1c33e938c
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Wed Nov 21 16:48:23 2007 +0100
 
-	* Makefile.am:
+    Oops. Fix missing space introduced by last commit.
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 3347c849462b737a873a279c24d17c873667c821
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Wed Nov 21 16:47:08 2007 +0100
 
-	* configure.ac:
+    Be more robust in test case if mode database is borked.
-	Update package version number for X11R7 RC3 release.
+    
+    If modes are reported multiple times per output only bother for the last.
 
-2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 81e8f2f5673befded3320424f4511e322d41c80b
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Wed Nov 21 16:41:33 2007 +0100
 
-	* configure.ac:
+    Some minor issues in test case fixed.
-	Update dependencies to work with separate build roots.
+    
+    'my' not being used correctly.
+    Some lines of xrandr --verbose output missing in failure case.
+    If order of outputs change in xrandr -q output they are sorted into original
+    order now.
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 3a27185879e7a9288de960ccb26a48104cf592e3
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Tue Nov 20 13:03:07 2007 +0100
 
-	* configure.ac:
+    More tests for ambiguous xrandr output.
-	Update package version number for RC1 release.
 
+commit c9bd9721e162e4d9d83dd60400c75d4cc98090bd
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Mon Nov 19 20:06:39 2007 +0100
+
+    Use IDs for mode selection instead of hand-crafted <w>x<h>@<r> strings.
+    
+    Some machines provide e.g. multiple 1024x768@60 modes with /slightly/
+    different timings. Often only one of them can be used on multiple outputs.
+
+commit a05d2b6e3ffd81ecc0be98b8d2b758505fb55f3f
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Mon Nov 19 12:24:04 2007 +0100
+
+    Improved test script.
+    
+    Allow for outputs in "unknown" state.
+    Check xrandr return value.
+    Output full xrandr --verbose output if test failed.
+
+commit e15a527b6cf1e66709eae4547c8e8bd3402362fe
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Mon Nov 12 15:25:44 2007 +0100
+
+    Add xrandr test suite.
+    
+    At the moment it only tests setting one output at a time, it should be
+    improved to add some multi-output setting as well.  Also it only tests clone
+    modes at the moment, no multi-monitor setups.
+
+commit f7aaf8947a0f216ffedc7040b0a1ef153b471425
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Mon Nov 12 15:19:52 2007 +0100
+
+    Always reset other outputs using the best crtc.
+    
+    pick_crtcs_score() didn't set up crtcs references correctly if anything but
+    the last output resulted in the best score.
+
+commit 307f3686d3d517cb29b8e66d8ad2ff76a48748b7
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Mon Nov 12 15:18:30 2007 +0100
+
+    Verify crtc against previous config.
+    
+    When selecting a crtc for an output, it doesn't check for already attached
+    outputs in check_crtc_for_output(), and so may select an crtc that is already
+    in use.
+    E.g. when changing from a cloned mode the displays won't be split up to
+    different crtcs, but the same crtc will be used, changing the resolution for
+    the unspecified display as well.
+
+commit 4834439ce62e41204367cf5356a7a1719870791f
+Author: Matthias Hopf <mhopf@suse.de>
+Date:   Thu Oct 11 16:54:40 2007 +0200
+
+    Build ChangeLog from git-log automatically.
+
+commit 2fa28afb035cf2d2efb077db58d3858c57189be4
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Tue Oct 2 11:06:18 2007 -0400
+
+    Death to ChangeLog
+
+commit 0cfaad401711092f8858cdec64e4d4f33023f398
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Tue Oct 2 11:06:02 2007 -0400
+
+    Update COPYING
+
+commit 06d7272d845033fe3c6f0625cce5a32e7be636a7
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Thu Aug 9 19:06:37 2007 +0200
+
+    When invoked with no option, xrandr dumps existing modes
+
+commit b9b2fbbf7a7dd156d1fdffac2e4a4046f58baabb
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Thu Aug 9 19:04:58 2007 +0200
+
+    Add *current and +preferred to the --verbose output
+
+commit 200491c1fad5ea1a733dfbac799a2ebea0a2f23c
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Wed Jul 4 20:05:03 2007 -0700
+
+    Bump to 1.2.2
+
+commit 9db36331a2acafbf2dab05f481ce16ab094fde52
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Wed Jul 4 20:04:29 2007 -0700
+
+    Print out mode flags in --verbose mode
+
+commit 49058de9b743f5196f97fb13cd9a695087b1299c
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Wed Jul 4 19:41:32 2007 -0700
+
+    Mark 1.1 options as inconsistent with 1.2 options
+
+commit c58e79a9c4c3967fb31a49a610a37b5797426415
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Jun 21 15:57:37 2007 +0100
+
+    Document 1.2.1 options
+
+commit 0499ce5ed6378bc68cbf8eafc9932ddf495ae708
+Author: Keith Packard <keithp@dulcimer.keithp.com>
+Date:   Sat Jun 30 14:00:30 2007 -0700
+
+    When simple CRTC allocation fails, search all available configs.
+    
+    When enabling an output, if there isn't an idle CRTC available, try to
+    reconfigure existing outputs to make things work.
+
+commit 0f2014e67193eb0f8e12ab1c3d5cae8991ba439d
+Author: Keith Packard <keithp@dulcimer.keithp.com>
+Date:   Sat Jun 30 13:09:45 2007 -0700
+
+    Clean up code structure a bit
+
+commit 63d385f2c24c522d974652da138a83d78014713e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jun 21 09:35:53 2007 -0700
+
+    Add *~ to .gitignore to skip emacs & patch droppings
+
+commit 4bd2f4004a6f75a7e4cb32b9e320e680f8839748
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Jun 21 09:34:53 2007 -0700
+
+    Man page formatting and typo fixes
+
+commit b0812f8efe448c85979a9f5fab4a5a4e0c0e78d0
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Jun 21 11:37:56 2007 +0100
+
+    Update to version 1.2.1
+
+commit 739f01957c8ebd3b7bcecfd7ad8174884561f7db
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed Apr 25 11:59:48 2007 -0700
+
+    Fix bugs found by compiling with -Wall.
+    
+    Also fix some unused variable warnings.
+
+commit 8e43df335679c71930465e4c58c0bd14d9add29a
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed Apr 25 10:52:19 2007 -0700
+
+    Fix a typo.  Make mode flags case insensitive.  Improve error messages.
+
+commit 49aab1e0e4cb2226d5bcc8e4e6217309fd23ce52
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Fri Apr 6 03:36:27 2007 -0700
+
+    Skip relative positions for outputs without modes.
+    
+    An output without a mode is turned off; do not try to position it.
+
+commit 86d9b15cccc4d21ad5e5d34d7e7b82a50903939b
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Sun Mar 25 23:44:01 2007 -0700
+
+    Support XA_ATOM properties (like TV_FORMAT).
+    
+    Atom properties have lists of valid values that are all atoms, so display
+    those. Also, fetch property data and use that to determine which format new
+    property values are supposed to be in.
+
+commit dba14af8328eaaad716d1c27a5514df285d8d4cc
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Fri Mar 23 01:21:21 2007 -0700
+
+    Add --set option to set output properties.
+    
+    Numeric values are set as XA_INTEGER format 32 values, everything else is
+    set as an XA_STRING format 8 value.
+
+commit ca7a5bb5691ecd1d8da6def373c793aa7a07dbbe
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Thu Mar 15 20:57:17 2007 -0700
+
+    Bounds check -s <index> argument to be 0 <= index < nsize
+    
+    Print a nice error message when the -s option is passed a number out of
+    bounds.
+
+commit 0cbbc7804781c2e55899ba9271365735c4a2b544
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Thu Mar 15 20:56:15 2007 -0700
+
+    Make --q1 output RandR 1.1 query information.
+    
+    --q1 required a --query option to actually output any information.
+
+commit 7ae11b66cc26395d34070013e23813db3ca3e55f
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Thu Mar 15 20:55:30 2007 -0700
+
+    Make --auto after --output only affect the output.
+    
+    --auto has two meanings; if presented before any --output flags, it requests
+    that connected-but-disabled outputs be enable while disconnected-but-enabled
+    outputs be disabled. After --output, --auto simply asks that the mode used
+    for the output be automatically selected. Mixing these two operations is not
+    a good default.
+
+commit a53cc9b37c40dca936037a89013253f37c9a05ee
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Mon Mar 12 22:47:39 2007 -0700
+
+    Add --addmode and --delmode commands to edit list of modes per output.
+    
+    --addmode <output> <mode> inserts <mode> into the list supported by
+    <output>, while --delmode removes a mode.
+
+commit dca4bd66b166b64314993aba34a3080c6953ac12
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Mon Feb 19 17:12:24 2007 -0800
+
+    Add --newmode/--rmmode to create/destroy user modes.
+    
+    The syntax may be a bit hard to work with, but these serve to test the
+    server infrastructure for custom modes.
+
+commit 9fd6aa1445a8f1e721ba8cdcd1ac12375d6e5a26
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Fri Mar 9 10:12:17 2007 +0100
+
+    Fixed alignment of the clones list.
+
+commit 3c44d68d78d8bddf69b5bd1a00f854d8cde971bb
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Wed Feb 21 11:24:35 2007 -0800
+
+    Add --same-as option to match output positions.
+    
+    This provides another positioning option that makes two outputs appear at
+    the same location.
+
+commit 8a0c3b748b0e94c97fbc2a7449c6740b8acfe394
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Feb 18 21:27:55 2007 -0800
+
+    Update version number to 1.2.0 for release.
+
+commit 13cef2baa884039e96f5dfd9245bb949aed99448
+Merge: 065f09c... a175972...
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Feb 18 21:26:50 2007 -0800
+
+    Merge branch 'origin'
+
+commit 065f09cc304d0c70eaf3cf6f3ff21e712e41d205
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Feb 18 21:25:54 2007 -0800
+
+    Require only libXrandr 1.2.0, not 1.2.0.0.
+    
+    Four digits seems excessive in a library version number.
+
+commit a175972de6fbe5426fb5c6bee03112678f0a9548
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Thu Feb 15 23:07:34 2007 -0800
+
+    Select crtc which can be cloned to outputs which will be in use.
+    
+    Correct crtc selection algorithm to choose a crtc which will be used by
+    outputs which can all share the same crtc.
+    
+    Also, make randr 1.0 commands work even when --verbose is specified, and
+    terminate event loop in that case when the screen change event is seen.
+
+commit d707822aab19a0a8fe08f03300fdd9d4e206871e
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sat Feb 10 18:27:06 2007 -0800
+
+    Selecting a crtc by index was failing to match a crtc.
+    
+    --crtc <index> would fail to match because of a logic bug using & instead of
+    &&.
+
+commit 89bf2c3c0e17c67adc3e2fdca54f0e8254dc8968
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sat Feb 10 16:14:58 2007 -0800
+
+    Display set of available CRTCs per output in --verbose mode.
+
+commit 067cafb5cda0aa6e34773e888fd469ff657760c2
+Merge: 7c25c24... b0a00df...
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Wed Jan 31 15:25:35 2007 -0800
+
+    Merge branch 'randr-1.2'
+    
+    Merge support for RandR 1.2 changes to the xrandr program along with
+    documentation for the new options.
+
+commit b0a00df69f832ada40be6bd6973835439a698440
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Wed Jan 31 15:22:02 2007 -0800
+
+    Update documentation to include all RandR 1.2 options.
+    
+    Also, require libXrandr version 1.2.0.0 or better.
+
+commit 6b9310d66eed59527d4002294be13884a7cbeacc
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Tue Jan 30 20:35:58 2007 -0800
+
+    Missing return statement from output_rotation.
+    
+    output_rotation was returning garbage making the available output rotations
+    display incorrectly.
+
+commit 5c3b6b1013c7565c40e82bfc0514a3dd80aec2d8
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Tue Jan 30 20:16:46 2007 -0800
+
+    Remove xrandr12.c app now that xrandr.c has RandR 1.2 support.
+
+commit eaf3e459d7760bbcb3c7f7c9b23b1e386189c71e
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Tue Jan 30 00:10:23 2007 -0800
+
+    Add --reflect option for RandR 1.2 reflection selection.
+    
+    Also, display available rotations after current rotation
+
+commit 8ecc6c034836a6fb6df0e2ad24429f506bf82e37
+Author: Eric Anholt <eric@anholt.net>
+Date:   Tue Jan 16 10:48:01 2007 -0800
+
+    Add display for 32-bit integer properties, such as backlight.
+
+commit 4112d13d7b15150e33687b687604c3a72188c066
+Author: Keith Packard <keithp@mandolin.keithp.com>
+Date:   Mon Jan 1 17:04:42 2007 -0800
+
+    Mode on CRTC may not be present for any output.
+    
+    When an output gets disconnected, the current CRTC mode may no longer be
+    listed as valid for any output, but will still be listed for the screen.
+    Search for current crtc mode in the screen list rather than the per-output
+    list.
+
+commit 6ef7b2deafd09ae1a4b159f3c2e6e9db64bf01dc
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Dec 31 23:02:12 2006 -0800
+
+    Using %lf to read float overwrote adjacent variable.
+    
+    Just use floats everywhere and %f instead.
+
+commit f6073333dcfb6989ff8793854fb42e08388444c5
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Dec 31 13:55:14 2006 -0800
+
+    Add rotation/reflection status to 1.2 query output.
+    
+    The previous cleanup had left these values missing from any output.
+    Also it now reports the effective size of the mode within the screen.
+
+commit 5d2a76b70b7b59a45655b25db79d75cb08fe671d
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Dec 31 13:38:40 2006 -0800
+
+    Clean up RandR 1.2 query output.
+    
+    Make brief mode list just mode names and refresh rates.
+    Add --prop/--properties flag to show properties.
+    Add --q1 flag to force showing pre-1.2 data.
+
+commit d9aeb4a7544ad4a33f6f54bc46bff5cdf231a986
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Dec 31 12:45:25 2006 -0800
+
+    Add --rate support to RandR 1.2 mode selection.
+    
+    Search for mode closest to specified rate for each output and use that
+    instead of the one with the first matching name. If no rate is specified,
+    the first one still matches allowing the driver to place preferred rates
+    first in the list.
+
+commit c04d69cbd8a8a96862356afcda6ee679d663a524
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sun Dec 31 11:58:11 2006 -0800
+
+    Grab server while applying changes.
+    
+    Applications that respond to screen size changes by quering Xinerama
+    information need to be blocked so that they see the entirety of the changes
+    rather than just the screen size shift and not the crtc changes.
+
+commit 8e78af971048db711163ea297153703b4f37f3c9
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sat Dec 30 21:49:40 2006 -0800
+
+    Enable global --auto flag. Allow output name for --dpi switch.
+    
+    --auto at the global level checks for output status changes and
+    automatically configures changed outputs. --dpi with an output switch uses
+    the specified output as the source of the dpi information.
+
+commit f7a3e478a6a5d59a2bbcd6dc416639f93a0520fd
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sat Dec 30 19:41:48 2006 -0800
+
+    Use Bool type. Position relative to disabled output is 0,0.
+    
+    Switch uses of int that are strictly boolean to Bool.
+    Instead of making attempts to set position relative to a disabled output an
+    error, just place the output at 0,0.
+
+commit cb017692883daf64e0cf442a39b33eaafed0e420
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Sat Dec 30 17:34:46 2006 -0800
+
+    Restructure RandR 1.2 support to handle relative placement.
+    
+    Ok, really, this is mostly a rewrite of the RandR 1.2 support.  First,
+    collect commands from command line arguments.  Next, fill in existing
+    configuration from X server.  Calculate new configuration. Apply
+    configuration, if anything fails, revert to previous configuration.
+    
+    Still left -- pure --auto, and --extend/--clone options.
+
+commit b9dee113ce4105c1cf25e3c417c616c024aea823
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Fri Dec 29 00:55:37 2006 -0800
+
+    Make query return 1.2 information if available
+
+commit 90e4a4c13957bd003294f64b86460813dd38a3de
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Dec 21 17:37:20 2006 -0800
+
+    Accept hex mode numbers as well as mode names.
+    
+    Sometimes mode names are ambiguous; this lets the user specify modes by XID.
+
+commit e8f7047885ec85096a3f35b9cfb20386104fdc55
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Tue Dec 19 16:27:46 2006 -0800
+
+    Actually respect the --fb option
+
+commit 7b32611632ab08b6a123db5df1c2b919b3a12104
+Merge: a0df3aa... 4bb1a9c...
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Tue Dec 19 15:58:38 2006 -0800
+
+    Merge branch 'randr-1.2-origin' into randr-1.2
+
+commit a0df3aa81205b35ff8d9541c036cfd158cbd99ed
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Tue Dec 19 15:58:21 2006 -0800
+
+    Correct format for sscanf to double variable "dpi"
+
+commit 4bb1a9cd6f9cc3ed61d7913528afa3f573092833
+Merge: b6c0382... 6ef400f...
+Author: Keith Packard <keithp@bouzouki.jf.intel.com>
+Date:   Wed Dec 13 11:36:36 2006 -0800
+
+    Merge branch 'randr-1.2-origin' into randr-1.2. Detect invalid mode.
+    
+    Invalid mode test was checking wrong mode index. Also, print more
+    informative error message when this occurs.
+
+commit b6c03827bae74ef5b9517c4246b0165dad8ee780
+Author: Keith Packard <keithp@bouzouki.jf.intel.com>
+Date:   Wed Dec 13 11:27:30 2006 -0800
+
+    Name CRTCs by index or id. Use current CRTC to get current mode.
+    
+    CRTCs have no intrinsic name, so let users provide either the number in the
+    list or the XID when referring to them explicitly.
+    When no mode is specified, look up the current CRTC for the output and use
+    that mode, instead of using the mode on the target CRTC.
+    When switching an output from one CRTC
+
+commit 6ef400f35d7d8712d1ad1efd87a8a3cb8bfacd96
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Wed Dec 13 09:53:17 2006 -0800
+
+    Add --preferred and --auto support.
+    
+    --preferred selects the 'best' mode for the monitor automatically, either by
+    looking for a preferred mode, or selecting one which is closest to the
+    current screen DPI.
+    
+    --auto checks connected status and disables the output if disconnected,
+    otherwise it enables it with the preferred mode (as if --preferred).
+
+commit c69c3080febd8617349f88557c3c04388a13a76c
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Tue Dec 12 09:54:52 2006 -0800
+
+    mark disabled crtc as changing, set rotation to 90 for disabled crtc.
+    
+    --off code was not correctly finding and marking the to-be-disabled crtc,
+    and the disabling code was sending an uninitialized rotation value to the
+    server when no outputs were connected.
+
+commit 6be56cd10d934e496004f9ffd377225fd179f4b1
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Mon Dec 11 00:39:48 2006 -0800
+
+    Update manual, elide unsupported options from usage, remove xrandr12 from build
+
+commit 624c75e8c250b33a81890c8f0da741a13ad4e7d1
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Mon Dec 11 00:23:15 2006 -0800
+
+    Add RandR 1.2 support to plain xrandr app. primitive for now
+
+commit 7c25c245bceb0474541fe7a2615a4f665842ac32
+Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
+Date:   Sat Dec 9 06:32:19 2006 -0600
+
+    Document -v switch.
+
+commit 2a32fa8cf8550a3a30871d25a23af07f65646c47
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Tue Nov 21 01:17:38 2006 -0800
+
+    Track RandR output property changes
+
+commit 795173d2b9b94a3468db277102b4898b4e5a1ead
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Nov 16 22:14:33 2006 -0800
+
+    properties are stored in unsigned char arrays
+
+commit 2df4352bb43e155977f8d4c0b53771cb0085ab74
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Nov 16 11:45:51 2006 -0800
+
+    Remove RandR output options.
+    
+    Output options are to be replaced with properties.
+
+commit 643787365fd716b902b597b67b2ec228dacfc862
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Wed Nov 1 10:57:24 2006 -0800
+
+    Re-indent to 4 space tabs
+
+commit 947ea6ee9d7cf72c5635c699b63ddda3be968675
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Wed Nov 1 10:55:21 2006 -0800
+
+    Fix copyright and license information
+
+commit dc41095b577db571439ff1a52facc4efe9f5132f
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Nov 9 20:26:09 2006 -0800
+
+    Print 8-bit integer output properties as 32-char rows of hex.
+    
+    This happens to produce pretty output for EDID data.
+
+commit 67466ebb817e24bfd7f57cc82da16e194eb9c547
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Nov 9 17:15:56 2006 -0800
+
+    Add more .gitignore entries.
+
+commit aafe9f7d24e96194a7ee11ba521a3c2c72dcdc95
+Author: Eric Anholt <eric@anholt.net>
+Date:   Thu Nov 9 17:15:06 2006 -0800
+
+    Add output for output properties (assuming text) and blanking information.
+
+commit 6ba07ae9ea5fa2829d17e8a1f3eb26e7c1a2813e
+Author: Eric Anholt <eric@anholt.net>
+Date:   Wed Nov 8 10:23:47 2006 -0800
+
+    Add dot clock to output.
+
+commit fba78f58029a806e4446d038b17b843d2c4026a6
+Author: Keith Packard <keithp@mandolin.keithp.com>
+Date:   Wed Nov 1 00:32:22 2006 -0800
+
+    Track protocol moving physical size from mode to output
+
+commit d9c45204a16e906b922ac94cae3c9f4f25b3ccdb
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Oct 26 22:58:58 2006 -0700
+
+    add physical size setting
+
+commit bd6ac82ff7e7fc04ab589a3053dc7f13ed7a1ec4
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Oct 5 21:50:42 2006 -0700
+
+    Add crtc info. Mark preferred. Update to new SetCrtcConfig API.
+
+commit fe04d38d01f54b93ddaf1cd48a655df7f7fe4b97
+Author: Keith Packard <keithp@neko.keithp.com>
+Date:   Thu Sep 21 08:16:45 2006 -0700
+
+    Add CRTC disable code (given crtc, output 0, mode 0)
+
+commit 7f1b81d443b78ff572726ad7d72eeb4a87c7189d
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Wed Sep 20 20:03:22 2006 -0700
+
+    xrandr12, a horrible kludge, is now sufficient to do dynamic mergefb games.
+
+commit eba1d3d8ab6226737c29e63fdd5433190baab06f
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Wed Sep 20 20:02:43 2006 -0700
+
+    .cvsignore -> .gitignore
+
+commit 6c5af262350a5fa33aa37293e8e7b537e344f52a
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Wed Sep 20 20:02:09 2006 -0700
+
+    .cvsignore -> .gitignore
+
+commit d8e86340444577dc7634d3e0db24fd809f4e4fbb
+Author: Keith Packard <keithp@guitar.keithp.com>
+Date:   Tue Sep 19 00:35:46 2006 -0700
+
+    Add new xrandr12 program for RandR 1.2 protocol.
+    
+    Yes, xrandr12 will be merged with xrandr before release; it's just for
+    debugging at present.
+
+commit f88f8e79724b27f46a836fac4956cbe28749633a
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Apr 26 23:43:34 2006 +0000
+
+    Bump to 1.0.2
+
+commit 47c6288e63ebe7a9bb2f3225e7d5a235bd979a5f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Apr 25 22:54:01 2006 +0000
+
+    Don't try to fprintf a NULL string when -display wasn't passed and
+        connecting to $DISPLAY failed, since that segfaults on some platforms.
+
+commit 0197bfdddca98c72bca0eeee349b90027638fc32
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Mar 20 18:56:37 2006 +0000
+
+    Bug #5511, #5512: Print more sensible error messages when fed broken
+        command lines. (Bill Crawford)
+
+commit 4f785cb5db6d95c9f539500e7b202a0f5addd19f
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:53 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 83491d233781c9e6a362aa8bac1ab4f2a239fdee
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:46 2005 +0000
+
+    Stub COPYING files
+
+commit 5d09a0b505a2c08b81879e61173459d23f4c41db
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:10 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 3e0eb5b6f68ef9120153e7f01b4243ad4fa44254
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:25 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d52f178dc51182e14d5d7ad9f2842f3e1d30a57f
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:27 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit f3b3596d181a7ab89b90561490f822171ec77479
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:46 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 28c2280644f808c89e42e379b531fbb0fdf39bc7
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:35:07 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit e5ab923625baf41a59e033abf3527709c8ef255b
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:55 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit 7e1cf1fef9dd000569dd5390380fb567314644a5
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Nov 19 07:15:38 2005 +0000
+
+    Update pkgconfig files to separate library build-time dependencies from
+        application build-time dependencies, and update package deps to work
+        with separate build roots.
+
+commit 89ab28833d4e2ff412a92bb2b47af2d78a109c00
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:57 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 60178bb0c8bc97055c9aee7986866ada615491e6
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:24 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 958b347b1e5e427858d3e693e5487ec7ba4f5054
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:47 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 35e7414c6e4505b2e71be0e54ed0c7ff74f39db1
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Thu Oct 6 10:03:08 2005 +0000
+
+    Tell the user when setting the screen configuration fails. Return nonzero
+        so scripts can find out too.
+
+commit 938ff7de3f2bc4979bbf8a5f68190cde2be12696
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:37 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit f241e34fd0f3bedf5aa615dc8e17352b91de8cd9
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jul 22 07:18:28 2005 +0000
+
+    Fix path to man pages.
+
+commit f87ac740a20ec3e8b452959081816f5fddeaaf87
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:32:03 2005 +0000
+
+    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+        configure cache, you cache it, and the cached value is probably wrong.
+
+commit 5666f22654447eb381186a85a8e1630d419b0a88
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Fri Jul 1 20:27:45 2005 +0000
+
+    Build systems for xrdb, xrandr, xrefresh
+
+commit 39a8c733612722dca456c315a5ad299da1fe29d6
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date:   Sat Dec 4 00:43:18 2004 +0000
+
+    Encoding of numerous files changed to UTF-8
+
+commit df8c56f1f66cce27dd018248a30cd9465d2b545c
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:55:03 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 791685e93f32489dcd2d02a77e1a79ffb6c97c17
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:35:42 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 342e5f4d491f137e3930213e62192de3eece3155
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:13:15 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit e3c0383c8fdcf38d34b3fad607949b0693184ca7
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:26 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 633350fa648d2b57b3dd94cb1d220a0b826bef55
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:24:14 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 22c66075090a14ad022ae73a080e76a5ace7c5d1
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:15 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 05fa20267de7cdf44fb6de556910ed0e4ce665a5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit c973a27b6d07b8711041c0c22ba8568f168b447a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    Initial revision

xrandr/INSTALL

@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

xrandr/Makefile.am

@@ -34,8 +34,9 @@ appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh xrandr_test.pl
 CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
 
 SED = sed
 
@@ -60,3 +61,12 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+	(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+

xrandr/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,15 +36,11 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,17 +55,17 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xrandr$(EXEEXT)
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
+	config.guess config.sub depcomp install-sh missing
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -80,7 +76,7 @@ am_xrandr_OBJECTS = xrandr.$(OBJEXT)
 xrandr_OBJECTS = $(am_xrandr_OBJECTS)
 am__DEPENDENCIES_1 =
 xrandr_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -113,8 +109,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -137,6 +131,7 @@ ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -148,11 +143,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -168,9 +162,11 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XRANDR_CFLAGS = @XRANDR_CFLAGS@
 XRANDR_LIBS = @XRANDR_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -182,6 +178,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -209,8 +206,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CFLAGS = $(XRANDR_CFLAGS)
 xrandr_LDADD = $(XRANDR_LIBS)
 xrandr_SOURCES = \
@@ -221,8 +221,9 @@ appman_PRE = \
 
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh xrandr_test.pl
 CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
 SED = sed
 
 # Strings to replace in man pages
@@ -284,7 +285,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -299,7 +300,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -322,7 +323,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 xrandr$(EXEEXT): $(xrandr_OBJECTS) $(xrandr_DEPENDENCIES) 
 	@rm -f xrandr$(EXEEXT)
-	$(LINK) $(xrandr_LDFLAGS) $(xrandr_OBJECTS) $(xrandr_LDADD) $(LIBS)
+	$(LINK) $(xrandr_OBJECTS) $(xrandr_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -333,22 +334,21 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrandr.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
+	test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
 	@list='$(appman_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -369,8 +369,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -382,8 +382,8 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -393,13 +393,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -414,23 +413,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
+	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	  esac; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -441,10 +439,13 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -453,6 +454,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -480,6 +485,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -519,7 +526,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -543,7 +550,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -570,6 +577,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -593,12 +601,20 @@ info-am:
 
 install-data-am: install-appmanDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -620,27 +636,37 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
-	uninstall-info-am
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
-	distclean-compile distclean-generic distclean-hdr \
+	distcheck distclean distclean-compile distclean-generic \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	distclean-hdr distclean-tags distcleancheck distdir \
-	dvi-am html html-am info info-am install install-am \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install-appmanDATA install-binPROGRAMS install-data \
+	install install-am install-appmanDATA install-binPROGRAMS \
-	install-data-am install-exec install-exec-am install-info \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-info-am install-man install-strip installcheck \
+	install-exec install-exec-am install-html install-html-am \
-	installcheck-am installdirs maintainer-clean \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS
-	uninstall-info-am
 
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+	(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

xrandr/aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+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'.])])
+
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -79,16 +87,14 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
+[if test -n "$$1"; then
-    if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
-        pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    PKG_CHECK_EXISTS([$3],
-        PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
-			 [pkg_failed=yes])
+ else
-    fi
+    pkg_failed=untried
-else
-	pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -132,9 +138,9 @@ See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -216,7 +222,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -365,7 +371,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -637,14 +647,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -653,7 +663,7 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 		[Patch version of this package])
 ])
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -663,14 +673,31 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+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.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -727,14 +754,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -743,8 +770,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
+AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -758,15 +787,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -794,6 +822,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -859,6 +888,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -911,7 +941,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -936,8 +967,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
+  # Grep'ing the whole file is not good either: AIX grep has a line
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -996,14 +1028,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -1020,16 +1052,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-   test -f $srcdir/config.status; then
+  # is not polluted with repeated "-I."
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -1049,6 +1085,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -1084,6 +1123,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -1097,16 +1140,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -1119,7 +1163,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -1226,14 +1270,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -1249,6 +1293,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -1259,7 +1304,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1267,60 +1312,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+# Check for `mkdir -p'.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+[AC_PREREQ([2.60])dnl
-  # We used to keeping the `.' as first argument, in order to
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  # allow $(mkdir_p) to be used without argument.  As in
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-  #   $(mkdir_p) $(somedir)
+dnl while keeping a definition of mkdir_p for backward compatibility.
-  # where $(somedir) is conditionally defined.  However this is wrong
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-  # for two reasons:
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-  #  1. if the package is installed by a user who cannot write `.'
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-  #     make install will fail,
+dnl adjustment using top_builddir (which is defined more often than
-  #  2. the above comment should most certainly read
+dnl MKDIR_P).
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-  #     so it does not work when $(somedir) is undefined and
+case $mkdir_p in
-  #     $(DESTDIR) is not.
+  [[\\/$]]* | ?:[[\\/]]*) ;;
-  #  To support the latter case, we have to write
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+esac
-  #  so the `.' trick is pointless.
+])
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -1432,9 +1440,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.

xrandr/autogen.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+

xrandr/compile

@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

xrandr/config.guess

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Inc.
+#   Free Software Foundation, Inc.
 
-timestamp='2007-03-06'
+timestamp='2008-01-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -532,7 +532,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -793,12 +793,15 @@ EOF
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
+    xtensa*:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so

xrandr/config.sub

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Inc.
+#   Free Software Foundation, Inc.
 
-timestamp='2007-01-18'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -475,8 +487,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
+	cr16)
-		basic_machine=cr16c-unknown
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -668,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -683,6 +703,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -809,6 +833,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1017,6 +1049,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;

xrandr/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xrandr 1.2.2.
+# Generated by GNU Autoconf 2.61 for xrandr 1.2.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xrandr'
 PACKAGE_TARNAME='xrandr'
-PACKAGE_VERSION='1.2.2'
+PACKAGE_VERSION='1.2.3'
-PACKAGE_STRING='xrandr 1.2.2'
+PACKAGE_STRING='xrandr 1.2.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL
@@ -618,6 +618,7 @@ target_alias
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -1194,7 +1195,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xrandr 1.2.2 to adapt to many kinds of systems.
+\`configure' configures xrandr 1.2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1264,7 +1265,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xrandr 1.2.2:";;
+     short | recursive ) echo "Configuration of xrandr 1.2.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1359,7 +1360,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xrandr configure 1.2.2
+xrandr configure 1.2.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1373,7 +1374,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xrandr $as_me 1.2.2, which was
+It was created by xrandr $as_me 1.2.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1726,7 +1727,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -1909,38 +1911,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-  # We used to keeping the `.' as first argument, in order to
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-  # allow $(mkdir_p) to be used without argument.  As in
+if test -z "$MKDIR_P"; then
-  #   $(mkdir_p) $(somedir)
+  if test "${ac_cv_path_mkdir+set}" = set; then
-  # where $(somedir) is conditionally defined.  However this is wrong
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
 else
-  # On NextStep and OpenStep, the `mkdir' command does not
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-  # recognize any option.  It will interpret all options as
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-  # directories to create, and then abort because `.' already
+do
-  # exists.
+  IFS=$as_save_IFS
-  for d in ./-p ./--version;
+  test -z "$as_dir" && as_dir=.
-  do
+  for ac_prog in mkdir gmkdir; do
-    test -d $d && rmdir $d
+	 for ac_exec_ext in '' $ac_executable_extensions; do
-  done
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+	     'mkdir (GNU coreutils) '* | \
-    mkdir_p='$(mkinstalldirs)'
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2023,12 +2040,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-   test -f $srcdir/config.status; then
+  # is not polluted with repeated "-I."
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2043,7 +2064,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xrandr'
- VERSION='1.2.2'
+ VERSION='1.2.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2071,7 +2092,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2175,7 +2196,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2200,9 +2221,7 @@ fi
 
   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
+   if test $USE_MAINTAINER_MODE = yes; then
-
-if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -3188,9 +3207,7 @@ if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
+ if test "x$enable_dependency_tracking" != xno; then
-
-if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3200,7 +3217,6 @@ fi
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3268,6 +3284,7 @@ else
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3297,9 +3314,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
+ if
-
-if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3517,11 +3532,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XRANDR" >&5
 echo $ECHO_N "checking for XRANDR... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
+if test -n "$XRANDR_CFLAGS"; then
-    if test -n "$XRANDR_CFLAGS"; then
+    pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS"
-        pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2.0 xrender x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "xrandr >= 1.2.0 xrender x11") 2>&5
   ac_status=$?
@@ -3531,15 +3545,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-	pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XRANDR_LIBS"; then
-    if test -n "$XRANDR_LIBS"; then
+    pkg_cv_XRANDR_LIBS="$XRANDR_LIBS"
-        pkg_cv_XRANDR_LIBS="$XRANDR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.2.0 xrender x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "xrandr >= 1.2.0 xrender x11") 2>&5
   ac_status=$?
@@ -3549,9 +3561,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-	pkg_failed=untried
 fi
 
 
@@ -3564,9 +3575,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr >= 1.2.0 xrender x11"`
+	        XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.2.0 xrender x11" 2>&1`
         else
-	        XRANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.2.0 xrender x11"`
+	        XRANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.2.0 xrender x11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XRANDR_PKG_ERRORS" >&5
@@ -3800,7 +3811,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -3809,7 +3820,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -4239,7 +4250,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xrandr $as_me 1.2.2, which was
+This file was extended by xrandr $as_me 1.2.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4292,7 +4303,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xrandr config.status 1.2.2
+xrandr config.status 1.2.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -4303,6 +4314,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -4510,6 +4522,7 @@ target_alias!$target_alias$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -4566,7 +4579,6 @@ DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
 ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
 APP_MAN_DIR!$APP_MAN_DIR$ac_delim
 LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim
-FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -4608,6 +4620,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
 MISC_MAN_DIR!$MISC_MAN_DIR$ac_delim
 DRIVER_MAN_DIR!$DRIVER_MAN_DIR$ac_delim
 ADMIN_MAN_DIR!$ADMIN_MAN_DIR$ac_delim
@@ -4615,7 +4628,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -4842,6 +4855,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -4895,6 +4913,7 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
@@ -5010,21 +5029,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5059,8 +5079,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
+  # Grep'ing the whole file is not good either: AIX grep has a line
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

xrandr/configure.ac

@@ -1,4 +1,3 @@
-
 dnl  Copyright 2005 Red Hat, Inc.
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xrandr,[1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
+AC_INIT(xrandr,[1.2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

xrandr/depcomp

@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2007-03-29.01
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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
@@ -91,7 +92,20 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -201,34 +215,39 @@ aix)
   # 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.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  tmpdepfile="$stripped.u"
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # 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:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -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
@@ -276,6 +295,46 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 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'.
@@ -288,13 +347,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is

xrandr/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2006-12-25.00
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
-mvprog="${MVPROG-mv}"
+chgrpprog=${CHGRPPROG-chgrp}
-cpprog="${CPPROG-cp}"
+chmodprog=${CHMODPROG-chmod}
-chmodprog="${CHMODPROG-chmod}"
+chownprog=${CHOWNPROG-chown}
-chownprog="${CHOWNPROG-chown}"
+cmpprog=${CMPPROG-cmp}
-chgrpprog="${CHGRPPROG-chgrp}"
+cpprog=${CPPROG-cp}
-stripprog="${STRIPPROG-strip}"
+mkdirprog=${MKDIRPROG-mkdir}
-rmprog="${RMPROG-rm}"
+mvprog=${MVPROG-mv}
-mkdirprog="${MKDIRPROG-mkdir}"
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
+     --help     display this help and exit.
--d         create directories instead of installing files.
+     --version  display version info and exit.
--g GROUP   $chgrpprog installed files to GROUP.
+
--m MODE    $chmodprog installed files to MODE.
+  -c            (ignored)
--o USER    $chownprog installed files to USER.
+  -C            install only if different (preserve the last data modification time)
--s         $stripprog installed files.
+  -d            create directories instead of installing files.
--t DIRECTORY  install into DIRECTORY.
+  -g GROUP      $chgrpprog installed files to GROUP.
--T         report an error if DSTFILE is a directory.
+  -m MODE       $chmodprog installed files to MODE.
---help     display this help and exit.
+  -o USER       $chownprog installed files to USER.
---version  display version info and exit.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
+    -c) ;;
-        continue;;
 
-    -d) dir_arg=true
+    -C) copy_on_change=true;;
-        shift
+
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
+	shift;;
-        shift
-        continue;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
-        shift
+	case $mode in
-        shift
+	  *' '* | *'	'* | *'
-        continue;;
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
+	shift;;
-        shift
-        continue;;
 
-    -s) stripcmd=$stripprog
+    -s) stripcmd=$stripprog;;
-        shift
-        continue;;
 
-    -t) dstarg=$2
+    -t) dst_arg=$2
-	shift
+	shift;;
-	shift
-	continue;;
 
-    -T) no_target_directory=true
+    -T) no_target_directory=true;;
-	shift
-	continue;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
+    --)	shift
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
+    dstdir=$dst
-
+    test -d "$dstdir"
-    if test -d "$dst"; then
+    dstdir_status=$?
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
+  obsolete_mkdir_used=false
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
-  # Make sure that the destination directory exists.
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
-  # Skip lots of stat calls in the usual case.
+	  *[0-7])
-  if test ! -d "$dstdir"; then
+	    mkdir_umask=`expr $umask + 22 \
-    defaultIFS='
+	      - $umask % 100 % 40 + $umask % 20 \
-	 '
+	      - $umask % 10 % 4 + $umask % 2
-    IFS="${IFS-$defaultIFS}"
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
 
-    oIFS=$IFS
+	# With -d, create the new directory with the user-specified mode.
-    # Some sh's can't handle IFS=/ for some reason.
+	# Otherwise, rely on $mkdir_umask.
-    IFS='%'
+	if test -n "$dir_arg"; then
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+	  mkdir_mode=-m$mode
-    shift
+	else
-    IFS=$oIFS
+	  mkdir_mode=
+	fi
 
-    pathcomp=
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-    while test $# -ne 0 ; do
+	    if (umask $mkdir_umask &&
-      pathcomp=$pathcomp$1
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
+      $posix_glob set +f
-        $mkdirprog "$pathcomp"
+      IFS=$oIFS
-	# mkdir can fail with a `File exist' error in case several
+
-	# install-sh are creating the directory concurrently.  This
+      prefixes=
-	# is OK.
+
-	test -d "$pathcomp" || exit
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
+    fi
-    done
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,48 +458,59 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
-    # Now rename the file to the real destination.
+    # If -C, don't bother to copy if it wouldn't change the file.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    if $copy_on_change &&
-      || {
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-	   # The rename failed, perhaps because mv can't rename something else
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
 
-	   # Now remove or move aside any old file at destination location.
+       eval "$initialize_posix_glob" &&
-	   # We try this two ways since rm can't unlink itself on some
+       $posix_glob set -f &&
-	   # systems and the destination file might be busy for other
+       set X $old && old=:$2:$4:$5:$6 &&
-	   # reasons.  In this case, the final cleanup might fail but the new
+       set X $new && new=:$2:$4:$5:$6 &&
-	   # file should still install successfully.
+       $posix_glob set +f &&
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
 
-	   # Now rename the file to the real destination.
+       test "$old" = "$new" &&
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-	 }
+    then
-    }
+      rm -f "$dsttmp"
-  fi || { (exit 1); exit 1; }
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="

xrandr/missing

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    if test -z "$file"; then
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
-    fi
-    if [ -f "$file" ]; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0

xrandr/xrandr.c

@@ -1284,6 +1284,20 @@ check_crtc_for_output (crtc_t *crtc, output_t *output)
 	if (crtc->rotation != output->rotation)
 	    return False;
     }
+    else if (crtc->crtc_info->noutput)
+    {
+	/* make sure the state matches the already used state */
+	XRRModeInfo *mode = find_mode_by_xid (crtc->crtc_info->mode);
+
+	if (mode != output->mode_info)
+	    return False;
+	if (crtc->crtc_info->x != output->x)
+	    return False;
+	if (crtc->crtc_info->y != output->y)
+	    return False;
+	if (crtc->crtc_info->rotation != output->rotation)
+	    return False;
+    }
     return True;
 }
 
@@ -1520,14 +1534,13 @@ pick_crtcs_score (output_t *outputs)
 	    best_score = score;
 	}
     }
+    if (output->crtc_info != best_crtc)
+	output->crtc_info = best_crtc;
     /*
      * Reset other outputs based on this one using the best crtc
      */
-    if (output->crtc_info != best_crtc)
+    (void) pick_crtcs_score (outputs);
-    {
+
-	output->crtc_info = best_crtc;
-	(void) pick_crtcs_score (outputs);
-    }
     return best_score;
 }
 
@@ -1544,11 +1557,18 @@ pick_crtcs (void)
      */
     for (output = outputs; output; output = output->next)
     {
-	if (output->changes && output->mode_info && !output->crtc_info)
+	if (output->changes && output->mode_info)
 	{
-	    output->crtc_info = find_crtc_for_output (output);
+	    if (output->crtc_info) {
-	    if (!output->crtc_info)
+		if (output->crtc_info->crtc_info->noutput > 0 &&
-		break;
+		    (output->crtc_info->crtc_info->noutput > 1 ||
+		     output != find_output_by_xid (output->crtc_info->crtc_info->outputs[0])))
+		    break;
+	    } else {
+		output->crtc_info = find_crtc_for_output (output);
+		if (!output->crtc_info)
+		    break;
+	    }
 	}
     }
     /*
@@ -1712,9 +1732,12 @@ main (int argc, char **argv)
 	}
 	if (!strcmp ("--output", argv[i])) {
 	    if (++i >= argc) usage();
-	    output = add_output ();
 
-	    set_name (&output->output, argv[i], name_string|name_xid);
+	    output = find_output_by_name (argv[i]);
+	    if (!output) {
+		output = add_output ();
+		set_name (&output->output, argv[i], name_string|name_xid);
+	    }
 	    
 	    setit_1_2 = True;
 	    continue;
@@ -2404,6 +2427,10 @@ main (int argc, char **argv)
 		    for (f = 0; mode_flags[f].flag; f++)
 			if (mode->modeFlags & mode_flags[f].flag)
 			    printf (" %s", mode_flags[f].string);
+		    if (mode == output->mode_info)
+			printf (" *current");
+		    if (j < output_info->npreferred)
+			printf (" +preferred");
 		    printf ("\n");
 		    printf ("        h: width  %4d start %4d end %4d total %4d skew %4d clock %6.1fKHz\n",
 			    mode->width, mode->hSyncStart, mode->hSyncEnd,

xrandr/xrandr.man

@@ -70,8 +70,15 @@ xrandr \- primitive command line interface to RandR extension
 .I Xrandr
 is used to set the size, orientation and/or reflection of the outputs for a
 screen. It can also set the screen size.
-There are a few global options; the rest modify a particular output and
+
-follow the specification of that output on the command line.
+If invoked without any option, it will dump the state of the outputs,
+showing the existing modes for each of them, with a '+' after the preferred
+mode and a '*' after the current mode.
+
+There are a few global options. Other options modify the last output that is
+specified in earlier parameters in the command line. Multiple outputs may
+be modified at the same time by passing mutiple \-\-output options followed
+immediately by their corresponding modifying options.
 .IP \-\-help
 Print out a summary of the usage and exit.
 .IP \-v

xrandr/xrandr_test.pl

@@ -0,0 +1,329 @@
+#!/usr/bin/perl
+
+#
+# xrandr Test suite
+#
+# Do a set of xrandr calls and verify that the screen setup is as expected
+# after each call.
+#
+
+$xrandr="xrandr";
+$xrandr=$ENV{XRANDR} if defined $ENV{XRANDR};
+$version="0.1";
+$inbetween="";
+print "\n***** xrandr test suite V$version *****\n\n";
+
+# Known issues and their fixes
+%fixes=(
+ s2 => "xrandr: 307f3686",
+ s4 => "xserver: f7dd0c72",
+ s11 => "xrandr: f7aaf894",
+ s18 => "issue known, but not fixed yet"
+);
+
+# Get output configuration
+@outputs=();
+%mode_name=();
+%out_modes=();
+%modes=();
+open P, "$xrandr --verbose|" or die "$xrandr";
+while (<P>) {
+  if (/^\S/) {
+    $o=""; $m=""; $x="";
+  }
+  if (/^(\S+)\s(connected|unknown connection)\s/) {
+    $o=$1;
+    push @outputs, $o         if $2 eq "connected";
+    push @outputs_unknown, $o if $2 eq "unknown connection";
+    $out_modes{$o}=[];
+  } elsif (/^\s+(\d+x\d+)\s+\((0x[0-9a-f]+)\)/) {
+    my $m=$1;
+    my $x=$2;
+    while (<P>) {
+      if (/^\s+(\d+x\d+)\s+\((0x[0-9a-f]+)\)/) {
+        print "WARNING: Ignoring incomplete mode $x:$m on $o\n";
+        $m=$1, $x=$2;
+      } elsif (/^\s+v:.*?([0-9.]+)Hz\s*$/) {
+        if (defined $mode_name{$x} && $mode_name{$x} ne "$m\@$1") {
+	  print "WARNING: Ignoring mode $x:$m\@$1 because $x:$mode_name{$x} already exists\n";
+	  last;
+	}
+	if (defined $modes{"$o:$x"}) {
+	  print "WARNING: Ignoring duplicate mode $x on $o\n";
+	  last;
+	}
+	$mode_name{$x}="$m\@$1";
+	push @{$out_modes{$o}}, $x;
+	$modes{"$o:$x"}=$x;
+	$modes{"$o:$m\@$1"}=$x;
+	$modes{"$o:$m"}=$x;
+        last;
+      }
+    }
+  }
+}
+close P;
+@outputs=(@outputs,@outputs_unknown) if @outputs < 2;
+
+# preamble
+if ($ARGV[0] eq "-w") {
+  print "Waiting for keypress after each test for manual verification.\n\n";
+  $inbetween='print "    Press <Return> to continue...\n"; $_=<STDIN>';
+} elsif ($ARGV[0] ne "") {
+  print "Preparing for test # $ARGV[0]\n\n";
+  $prepare = $ARGV[0];
+}
+
+print "Detected connected outputs and available modes:\n\n";
+for $o (@outputs) {
+  print "$o:";
+  my $i=0;
+  for $x (@{$out_modes{$o}}) {
+    print "\n" if $i++ % 3 == 0;
+    print "  $x:$mode_name{$x}";
+  }
+  print "\n";
+}
+print "\n";
+
+if (@outputs < 2) {
+  print "Found less than two connected outputs. No tests available for that.\n";
+  exit 1;
+}
+if (@outputs > 2) {
+  print "Note: No tests for more than two connected outputs available yet.\n";
+  print "Using the first two outputs.\n\n";
+}
+
+$a=$outputs[0];
+$b=$outputs[1];
+
+# For each resolution only a single refresh rate should be used in order to
+# reduce ambiguities. For that we need to find unused modes. The %used hash is
+# used to track used ones. All references point to <id>.
+#   <output>:<id>
+#   <output>:<width>x<height>@<refresh>
+#   <output>:<width>x<height>
+#   <id>
+#   <width>x<height>@<refresh>
+#   <width>x<height>
+%used=();
+
+# Find biggest common mode
+undef $sab;
+for my $x (@{$out_modes{$a}}) {
+  if (defined $modes{"$b:$x"}) {
+    $m=$mode_name{$x};
+    $sab="$x:$m";
+    $m =~ m/(\d+x\d+)\@([0-9.]+)/;
+    $used{$x} = $x;
+    $used{$1} = $x;
+    $used{"$a:$x"} = $x;
+    $used{"$b:$x"} = $x;
+    $used{"$a:$m"} = $mode_name{$x};
+    $used{"$b:$m"} = $mode_name{$x};
+    $used{"$a:$1"} = $x;
+    $used{"$b:$1"} = $x;
+    last;
+  }
+}
+if (! defined $sab) {
+  print "Cannot find common mode between $a and $b.\n";
+  print "Test suite is designed to need a common mode.\n";
+  exit 1;
+}
+
+# Find sets of additional non-common modes
+# Try to get non-overlapping resolution set, but if that fails get overlapping
+# ones but with different refresh values, if that fails any with nonequal
+# timings, and if that fails any one, but warn.
+# Try modes unknown to other outputs first, they might need common ones
+# themselves.
+sub get_mode {
+  my $o=$_[0];
+  for my $pass (1, 2, 3, 4, 5, 6, 7, 8, 9) {
+    CONT: for my $x (@{$out_modes{$o}}) {
+      $m = $mode_name{$x};
+      $m =~ m/(\d+x\d+)\@([0-9.]+)/;
+      next CONT if defined $used{"$o:$x"};
+      next CONT if $pass < 9 && defined $used{"$o:$m"};
+      next CONT if $pass < 7 && defined $used{"$o:$1"};
+      next CONT if $pass < 6 && defined $used{$m};
+      next CONT if $pass < 4 && defined $used{$1};
+      for my $other (@outputs) {
+        next if $other eq $o;
+        next CONT if $pass < 8 && defined $used{"$o:$x"};
+        next CONT if $pass < 5 && $used{"$other:$1"};
+	next CONT if $pass < 3 && $modes{"$other:$m"};
+	next CONT if $pass < 2 && $modes{"$other:$1"};
+      }
+      if ($pass >= 6) {
+        print "Warning: No more non-common modes, using $m for $o\n";
+      }
+      $used{"$o:$x"} = $x;
+      $used{"$o:$m"} = $x;
+      $used{"$o:$1"} = $x;
+      $used{$x} = $x;
+      $used{$m} = $x;
+      $used{$1} = $x;
+      return "$x:$m";
+    }
+  }
+  print "Warning: Cannot find any more modes for $o.\n";
+  return undef;
+}
+sub mode_to_randr {
+  $_[0] =~ m/^(0x[0-9a-f]+):(\d+)x(\d+)\@([0-9.]+)/;
+  return "--mode $1";
+}
+
+$sa1=get_mode($a);
+$sa2=get_mode($a);
+$sb1=get_mode($b);
+$sb2=get_mode($b);
+
+$mab=mode_to_randr($sab);
+$ma1=mode_to_randr($sa1);
+$ma2=mode_to_randr($sa2);
+$mb1=mode_to_randr($sb1);
+$mb2=mode_to_randr($sb2);
+
+# Shortcuts
+$oa="--output $a";
+$ob="--output $b";
+
+# Print config
+print "A:  $a (mab,ma1,ma2)\nB:  $b (mab,mb1,mb2)\n\n";
+print "mab: $sab\nma1: $sa1\nma2: $sa2\nmb1: $sb1\nmb2: $sb2\n\n";
+print "Initial config:\n";
+system "$xrandr";
+print "\n";
+
+# Test subroutine
+sub t {
+  my $name=$_[0];
+  my $expect=$_[1];
+  my $args=$_[2];
+  print "*** $name:  $args\n";
+  print "?   $expect\n" if $expect ne "";
+  if ($name eq $prepare) {
+    print "->  Prepared to run test\n\nRun test now with\n$xrandr --verbose $args\n\n";
+    exit 0;
+  }
+  my %r   = ();
+  my $r   = "";
+  my $out = "";
+  if (system ("$xrandr --verbose $args") == 0) {
+    # Determine active configuration
+    open P, "$xrandr --verbose|" or die "$xrandr";
+    my ($o, $c, $m, $x);
+    while (<P>) {
+      $out.=$_;
+      if (/^\S/) {
+        $o=""; $c=""; $m=""; $x="";
+      }
+      if (/^(\S+)\s(connected|unknown connection) (\d+x\d+)\+\d+\+\d+\s+\((0x[0-9a-f]+)\)/) {
+        $o=$1;
+	$m=$3;
+	$x=$4;
+	$o="A" if $o eq $a;
+	$o="B" if $o eq $b;
+      } elsif (/^\s*CRTC:\s*(\d)/) {
+        $c=$1;
+      } elsif (/^\s+$m\s+\($x\)/) {
+        while (<P>) {
+	  $out.=$_;
+          if (/^\s+\d+x\d+\s/) {
+	    $r{$o}="$x:$m\@?($c)" unless defined $r{$o};
+	    # we don't have to reparse this - something is wrong anyway,
+	    # and it probably is no relevant resolution as well
+	    last;
+	  } elsif (/^\s+v:.*?([0-9.]+)Hz\s*$/) {
+            $r{$o}="$x:$m\@$1($c)";
+	    last;
+	  }
+	}
+      }
+    }
+    for $o (sort keys %r) {
+      $r .= "  $o: $r{$o}";
+    }
+    close P;
+  } else {
+    $expect="success" if $expect="";
+    $r="failed";
+  }
+  # Verify
+  if ($expect ne "") {
+    print "->$r\n";
+    if ($r eq "  $expect") {
+      print "->  ok\n\n";
+    } else {
+      print "\n$out";
+      print "\n->  FAILED: Test # $name:\n\n";
+      print "    $xrandr --verbose $args\n\n";
+      if ($fixes{$name}) {
+        print "\nThere are known issues with some packages regarding this test.\n";
+	print "Please verify that you have at least the following git versions\n";
+	print "before reporting a bug to xorg-devel:\n\n";
+	print "    $fixes{$name}\n\n";
+      }
+      exit 1;
+    }
+    eval $inbetween;
+  } else {
+    print "->  ignored\n\n";
+  }
+}
+
+
+# Test cases
+#
+# The tests are carefully designed to test certain transitions between
+# RandR states that can only be reached by certain calling sequences.
+# So be careful with altering them. For additional tests, better add them
+# to the end of already existing tests of one part.
+
+# Part 1: Single output switching tests (except for trivial explicit --crtc)
+t ("p",   "",                        "$oa --off $ob --off");
+t ("s1",  "A: $sa1(0)",              "$oa $ma1 --crtc 0");
+t ("s2",  "A: $sa1(0)  B: $sab(1)",  "$ob $mab");
+# TODO: should be A: $sab(1) someday (auto re-cloning)"
+#t ("s3",  "A: $sab(1)  B: $sab(1)",  "$oa $mab");
+t ("s3",  "A: $sab(0)  B: $sab(1)",  "$oa $mab --crtc 0");
+t ("p4",  "A: $sab(1)  B: $sab(1)",  "$oa $mab --crtc 1 $ob --crtc 1");
+t ("s4",  "A: $sa2(0)  B: $sab(1)",  "$oa $ma2");
+t ("s5",  "A: $sa1(0)  B: $sab(1)",  "$oa $ma1");
+t ("s6",  "A: $sa1(0)  B: $sb1(1)",  "$ob $mb1");
+t ("s7",  "A: $sab(0)  B: $sb1(1)",  "$oa $mab");
+t ("s8",  "A: $sab(0)  B: $sb2(1)",  "$ob $mb2");
+t ("s9",  "A: $sab(0)  B: $sb1(1)",  "$ob $mb1");
+# TODO: should be B: $sab(0) someday (auto re-cloning)"
+#t ("s10", "A: $sab(0)  B: $sab(0)",  "$ob $mab");
+t ("p11", "A: $sab(0)  B: $sab(0)",  "$oa --crtc 0 $ob $mab --crtc 0");
+t ("s11", "A: $sa1(1)  B: $sab(0)",  "$oa $ma1");
+t ("s12", "A: $sa1(1)  B: $sb1(0)",  "$ob $mb1");
+t ("s13", "A: $sa1(1)  B: $sab(0)",  "$ob $mab");
+t ("s14", "A: $sa2(1)  B: $sab(0)",  "$oa $ma2");
+t ("s15", "A: $sa1(1)  B: $sab(0)",  "$oa $ma1");
+t ("p16", "A: $sab(0)  B: $sab(0)",  "$oa $mab --crtc 0 $ob --crtc 0");
+t ("s16", "A: $sab(1)  B: $sab(0)",  "$oa --pos 10x0");
+t ("p17", "A: $sab(0)  B: $sab(0)",  "$oa --crtc 0 $ob --crtc 0");
+t ("s17", "A: $sab(0)  B: $sab(1)",  "$ob --pos 10x0");
+t ("p18", "A: $sab(0)  B: $sab(0)",  "$oa --crtc 0 $ob --crtc 0");
+# TODO: s18-s19 are known to fail
+t ("s18", "A: $sab(1)  B: $sab(0)",  "$oa --crtc 1");
+t ("p19", "A: $sab(1)  B: $sab(1)",  "$oa --crtc 1 $ob --crtc 1");
+t ("s19", "A: $sab(0)  B: $sab(1)",  "$oa --pos 10x0");
+
+# Part 2: Complex dual output switching tests
+# TODO: d1 is known to fail
+t ("pd1", "A: $sab(0)",              "$oa --crtc 0 $ob --off");
+t ("d1",  "B: $sab(0)",              "$oa --off $ob $mab");
+
+# Done
+
+print "All tests succeeded.\n";
+
+exit 0;
+