debian/changelog | 2
xdpyinfo/ChangeLog | 394 +++++++++++++++++++++++++--
xdpyinfo/INSTALL | 236 ----------------
xdpyinfo/Makefile.am | 20 +
xdpyinfo/Makefile.in | 162 ++++++-----
xdpyinfo/aclocal.m4 | 222 ++++++++-------
xdpyinfo/config.guess | 32 +-
xdpyinfo/config.sub | 52 +++
xdpyinfo/configure | 697 ++++++++++++++++++++++++++-----------------------
xdpyinfo/configure.ac | 58 ++--
xdpyinfo/depcomp | 93 +++++-
xdpyinfo/install-sh | 514 ++++++++++++++++++++++++------------
xdpyinfo/missing | 61 ++--
xdpyinfo/mkinstalldirs | 158 -----------
xdpyinfo/xdpyinfo.c | 48 +++
xdpyinfo/xdpyinfo.man | 8
16 files changed, 1604 insertions(+), 1153 deletions(-)
New commits:
commit 6078232fc8c665dad4808266d3c3b1993c0205c6
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu May 22 16:44:42 2008 +0200
xdpyinfo 1.0.3
diff --git a/debian/changelog b/debian/changelog
index a45beab..03e5ea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ x11-utils (7.3+2) UNRELEASED; urgency=low
* Refresh patches.
* xprop 1.0.4
* update debian/copyright for xprop
+ * xdpyinfo 1.0.3
+ + xdpyinfo.man now references other x*info programs (closes: #350313).
-- Julien Cristau <[EMAIL PROTECTED]> Fri, 01 Feb 2008 01:23:34 +0100
diff --git a/xdpyinfo/ChangeLog b/xdpyinfo/ChangeLog
index 3d67183..a280b3c 100644
--- a/xdpyinfo/ChangeLog
+++ b/xdpyinfo/ChangeLog
@@ -1,49 +1,379 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 53743925d1067b830dd80f9193444f5799f55e28
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed May 21 14:19:52 2008 -0400
- * configure.ac:
- Update package version for X11R7 release.
+ xdpyinfo 1.0.3
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f70bd6335967fb3992399411d33e015b0d4d8f1d
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed May 21 14:18:57 2008 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Ignore errors from xf86misc rather than crashing out.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2c094e502060be530a306fe7f8feed6eddf9266f
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Wed Apr 30 14:37:03 2008 +0200
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Handle XExtension{Keyboard,Pointer}, added in inputproto 1.4
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bbf726ad95e75c844046968a00e1340cbbe6bd8a
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Dec 6 15:51:05 2007 -0500
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add missing PHONY line for automatic ChangeLog generation
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 66611f2fdca348c619afb4509e860919088c6fbf
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Thu May 24 18:24:29 2007 -0700
- * Makefile.am:
- * configure.ac:
- Update dependencies to work with separate build roots.
+ X.Org bug #10616: Add all the X info commands to See Also in man page
+
+ X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
+ Reported upstream from
+ Debian bug #350313
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350313>
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 704cb5aad217a1818c05e3cd5334c484020150e6
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 14:08:17 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ Version bump: 1.0.2
-2005-07-18 Daniel Stone <[EMAIL PROTECTED]>
+commit e7c95f92cb17eb971462074cfcc9b952bb466362
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 13:34:30 2007 -0700
- * configure.ac:
- Actually make extensions optional.
+ Clear a couple more memory leaks found by Sun Studio dbx check -leaks
-2005-07-09 Keith Packard <[EMAIL PROTECTED]>
+commit e411de3d660a5382e7cb8d31fa2fa1bc35823931
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 13:25:06 2007 -0700
- * .cvsignore:
- Add .cvsignore files
+ Coverity #748: IsPrintScreen: Returned without freeing storage "pscreens"
-2005-07-07 Keith Packard <[EMAIL PROTECTED]>
+commit ce6709132a322e82e915b761c0ced1bc418095ea
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 13:21:56 2007 -0700
- * Makefile.am:
- * configure.ac:
- Autodetect extension support. Install manual as xdpyinfo.1
- Note that autodetection requires changes to xdpyinfo.c as well,
- which currently lives in the monolithic tree. These changes
- don't have any effect on monolithic builds.
+ Coverity #749: print_XF86VidMode_info: Returned without freeing storage
"modelines"
+
+commit f4001e881a9f5d57dd99326d4f501737a0ded6e6
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 13:16:18 2007 -0700
+
+ Coverity #750: print_xinput_info() returned without freeing storage "ext"
+
+commit c896552ee94cf50f8acfccc49096e5ec564e5356
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 13:10:33 2007 -0700
+
+ Coverity #752: XListDepths return leaked in print_xrender_info()
+
+commit ea8455a0932c21ef29e97d469b492dadc85dabdc
+Author: Ingo Bormuth <[EMAIL PROTECTED]>
+Date: Thu May 25 03:13:00 2006 -0800
+
+ Bug 7027: Add configure options --without-dmx --without-dga
--without-xinerama
+
+ X.Org Bug 7027: <https://bugs.freedesktop.org/show_bug.cgi?id=7027>
+ Patch #5735: <https://bugs.freedesktop.org/attachment.cgi?id=5735>
+
+ From gentoo bug 132502: <http://bugs.gentoo.org/show_bug.cgi?id=132502>
+
+commit 2fe59be76e3a341b601838c3729d0045d49946d3
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Mar 20 10:39:36 2007 -0700
+
+ Fix line wrapping of extensions list in usage message
+
+commit 91f465babd46f1b39c6f5665e38e4aab58fc921b
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Mar 19 19:23:33 2007 -0700
+
+ Clear sparse warning: Using plain integer as NULL pointer
+
+commit 6a26c41570f1b91f14508cf3d44f4ed3c51127bd
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Mar 19 19:15:18 2007 -0700
+
+ Fix typos in comments
+
+commit 752b793aa03b67eeff6b01c7f0bdb729f00bd49b
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Mar 19 19:09:27 2007 -0700
+
+ Add support for checking sources with sparse/lint/etc.
+
+commit d66b154dce42319f73f4b0773e44c59c9cf9d7a6
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Mar 19 18:53:38 2007 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 767fdebc77faf1b7322e7068a420a7fc2bf4a376
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Mar 19 18:53:02 2007 -0700
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 421eee53c9153cfa6bb5ea27e8b8df5f186451a3
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Dec 21 02:29:49 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 263521ee094a1b63fd5ffdd2f81bd4c511fdb479
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Dec 19 16:22:43 2005 +0000
+
+ Stub COPYING files
+
+commit 74da6a6fdc7b90a779fab59811a162fe0571992c
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:24:06 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 58e6b96a84164845b49112bf6d76def97e909ef1
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:21 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d4cf291eff395b272590ba1415cdc5744dc39694
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:19 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit bdf02be37894b3e1b87437a8a0186fbd57f80e38
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:01:41 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 3a79f7e287e091102d56df996a19631709d99737
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Nov 21 10:34:59 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 1b28a57af4956be9a8e7d64dd5f0096ae43b3f6d
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Sun Nov 20 22:08:51 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit d91a0552a4b3c4f40e4b2ec10936c3f212a5d3bc
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Nov 19 07:15:36 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 eddecbe72843f358cf902a3a2081634745e52298
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:47:53 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 4689eb41b6329fec24a7da63a203576b72b937da
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 72bc207e91d9d770d17f8330cbba71a83b21d13d
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri Oct 14 00:25:44 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 0df7213be00f90d227be44efbb60c8f2fdd712ff
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri Aug 19 00:13:45 2005 +0000
+
+ More updates for Panoramix -> Xinerama rename
+
+commit 87e9acd02968882740bfbf51b68a1ef19584f371
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Aug 3 04:30:26 2005 +0000
+
+ More unique tokens for PKG_CHECK_MODULES
+
+commit 4fb83e624716886c60474f3bb443ffd730786889
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:32 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 ed783e6948cf7cd937f0570e9578162e35495d45
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Jul 20 19:31:52 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 bcc095561f040a8a0cd19ed94bc800d128e9c0b1
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Mon Jul 18 08:24:50 2005 +0000
+
+ Fail gracefully when extensions not present.
+
+commit 3b4cbb4fe34ff4de91ba6524d7750a2b55f5d67a
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date: Sat Jul 9 23:36:22 2005 +0000
+
+ Add .cvsignore files
+
+commit 1e169a60adf7d9759d3b4a4dfb381043814e121a
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date: Fri Jul 8 04:54:31 2005 +0000
+
+ Autodetect extension support. Install manual as xdpyinfo.1 Note that
+ autodetection requires changes to xdpyinfo.c as well, which currently
+ lives in the monolithic tree. These changes don't have any effect on
+ monolithic builds.
+
+commit d89449b6eacd919005fdad3b378e64fe46591728
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date: Fri Jul 8 04:54:09 2005 +0000
+
+ Add support for modular extension autodetection (ignored in monolithic
+ build)
+
+commit d99fbcde4c892e8d84e02b40ed3f5862a731e9c2
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Wed Jul 6 19:56:47 2005 +0000
+
+ Add buildsystem for xdpyinfo
+
+commit 1b09e416dcaed59d319b295b933506a6f54fe918
+Author: Roland Mainz <[EMAIL PROTECTED]>
+Date: Tue Apr 26 05:33:10 2005 +0000
+
+ //bugs.freedesktop.org/show_bug.cgi?id=2705) attachment #2555
+ (https://bugs.freedesktop.org/attachment.cgi?id=2555) bug 2705 part II:
+ Fix build to work with |#define BuildXprint NO| Patch by Kevin E.
+ Martin <[EMAIL PROTECTED]>.
+
+commit 5adf5a253e5434c2b0c2276ce3733cbb05282980
+Author: Roland Mainz <[EMAIL PROTECTED]>
+Date: Fri Mar 11 21:18:12 2005 +0000
+
+ xc/programs/twm/Imakefile
+ xc/programs/twm/twm.c
+ //bugs.freedesktop.org/show_bug.cgi?id=2705) attachment #2087
+ (https://bugs.freedesktop.org/attachment.cgi?id=2087) Make twm ignore
+ print screens to avoid that users accidentally warp on a non-video
+ screen (which are not visible on any monitor) when the Xserver has both
+ video and print screens. (This includes also a small cleanup of
+ xdpyinfo where parts of the print screen test code comes from) Patch by
+ Julien Lafon <[EMAIL PROTECTED]> (MIT/X.org license).
+
+commit 4d275dcc29658972a3d7c2e72b812140819a10c3
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Sep 2 05:50:38 2004 +0000
+
+ Clean up defines for Xprint support and fix BuildServersOnly build for
+ libXaw.
+
+commit a667763d5b733f5ae2d8a3ca7e1e99d3deed2830
+Author: Kristian Høgsberg <[EMAIL PROTECTED]>
+Date: Mon Aug 16 16:36:15 2004 +0000
+
+ As discussed and agreed on on the release-wranglers meeting of August 16,
+ I'm committing the patch from bug #1060 to back out unconditional
+ Xprint functionality.
+ Back out Xprint changes.
+ Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
+ CVS of April 25, to back out unconditional Xprint support.
+ Fix up Xprint config logic to be like the rest of the extensions:
+ BuildXprint is a one-stop option for disabling everything Xprint
+ related. XprtServer controls building Xprt, BuildXprintLib controls
+ building Xprint libs and BuildXprintClients controls building clients
+ related to Xprint. BuiltXprint defaults to YES and the other options
+ respects relevant settings, i.e. BuildServer and BuildServersOnly.
+ Build Xaw regardless of BuildXprintLib setting.
+ Only build xphelloworld, xplsprinters and xprehashprinterlist when
+ BuildXprintClients it YES. Disable building xmore, it has always
+ supported XawPrintShell.
+ Make Xprint support depend on BuildXprintLib.
+
+commit f5e06cb6bc7ddb2b81a819f4ef1ba41f7c66ba20
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Jun 30 20:06:56 2004 +0000
+
+ Add Distributed Multihead X (DMX) support
+
+commit ec6b1eb0128635b465ba46761b5d9ba3377db0e8
+Author: Roland Mainz <[EMAIL PROTECTED]>
+Date: Tue May 25 02:07:18 2004 +0000
+
+ Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=672 - RFE: xdpyinfo
+ should print information about print screens
+
+commit 4933a7a9f75fc80afba004f0c55959d35d7ffe41
+Author: Roland Mainz <[EMAIL PROTECTED]>
+Date: Sun May 16 21:52:44 2004 +0000
+
+ Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=623 -
+ RFE: "xdpyinfo" should have support for XpExtension.
+
+commit 0f274e479e7825d535ab04aeadd475d47e1769a5
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 19:54:43 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit cccbebfe7ee498cd8beae22831b50d570d623a94
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:35:14 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 26e6d0a4c391ee1e7ec6c3ca89f0955ca9423f09
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:13:00 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 4d33162b89fb90f764ce9bc9eed73b1c60ba631c
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:36:17 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d3552b39fa600adbf6229fad2e3f651d18889178
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:24:04 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 8dad0c498789e5feb268b70daae210751b98eb24
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:29:12 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c9f38bd47df33b0681bdf2cfce02c1b78cb1a038
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 212617e163d792b20d025502f4138b6bdb7829a0
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/xdpyinfo/INSTALL b/xdpyinfo/INSTALL
index 23e5f25..e69de29 100644
--- a/xdpyinfo/INSTALL
+++ b/xdpyinfo/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.
-
diff --git a/xdpyinfo/Makefile.am b/xdpyinfo/Makefile.am
index cf93b67..7284fa6 100644
--- a/xdpyinfo/Makefile.am
+++ b/xdpyinfo/Makefile.am
@@ -34,7 +34,7 @@ AM_CFLAGS = \
$(DPY_DMX_CFLAGS) \
$(DPY_XPRINT_CFLAGS) \
$(DPY_XTST_CFLAGS)
-
+
xdpyinfo_LDADD = \
$(XDPYINFO_LIBS) \
$(DPY_XEXT_LIBS) \
@@ -60,8 +60,16 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
+
+.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
SED = sed
@@ -86,3 +94,11 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xdpyinfo_SOURCES)
+endif LINT
diff --git a/xdpyinfo/Makefile.in b/xdpyinfo/Makefile.in
index 7c80a4a..f7a5571 100644
--- a/xdpyinfo/Makefile.in
+++ b/xdpyinfo/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,19 +55,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xdpyinfo$(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 \
- config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
-subdir = .
+ config.guess config.sub depcomp install-sh missing
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
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
@@ -86,7 +81,7 @@ xdpyinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
$(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = [EMAIL PROTECTED]@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -119,8 +114,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@
@@ -167,6 +160,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@
@@ -176,13 +170,14 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FLAGS = @LINT_FLAGS@
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@
@@ -198,9 +193,11 @@ STRIP = @STRIP@
VERSION = @VERSION@
XDPYINFO_CFLAGS = @XDPYINFO_CFLAGS@
XDPYINFO_LIBS = @XDPYINFO_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@
@@ -212,6 +209,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@
@@ -239,8 +237,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 = \
$(XDPYINFO_CFLAGS) \
$(DPY_XEXT_CFLAGS) \
@@ -277,8 +278,9 @@ appman_PRE = \
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
SED = sed
# Strings to replace in man pages
@@ -298,6 +300,9 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
[EMAIL PROTECTED]@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) \
[EMAIL PROTECTED]@ $(AM_CPPFLAGS) $(CPPFLAGS)
+
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -340,7 +345,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
@@ -355,7 +360,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 \
@@ -378,7 +383,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
xdpyinfo$(EXEEXT): $(xdpyinfo_OBJECTS) $(xdpyinfo_DEPENDENCIES)
@rm -f xdpyinfo$(EXEEXT)
- $(LINK) $(xdpyinfo_LDFLAGS) $(xdpyinfo_OBJECTS) $(xdpyinfo_LDADD)
$(LIBS)
+ $(LINK) $(xdpyinfo_OBJECTS) $(xdpyinfo_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -389,22 +394,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
$<
[EMAIL PROTECTED]@ 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:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
[EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@
`$(CYGPATH_W) '$<'`
[EMAIL PROTECTED]@ 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) \
@@ -425,8 +429,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; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -438,8 +442,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; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 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) \
@@ -449,13 +453,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; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -470,23 +473,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
