Update to xdpyinfo 1.0.3 + one local change: don't print (null)

from XF86VidModeGetMonitor().

8 files changed, 621 insertions, 85 deletions

diff --git a/app/xdpyinfo/ChangeLog b/app/xdpyinfo/ChangeLog
index 3d67183f0..a280b3c05 100644
--- a/app/xdpyinfo/ChangeLog
+++ b/app/xdpyinfo/ChangeLog
@@ -1,49 +1,379 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 53743925d1067b830dd80f9193444f5799f55e28
+Author: Adam Jackson <ajax@redhat.com>
+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 <ajax@redhat.com>
+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 <jcristau@debian.org>
+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 <cloos@jhcloos.com>
+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 <alan.coopersmith@sun.com>
+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 <alan.coopersmith@sun.com>
+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  <daniel@freedesktop.org>
+commit e7c95f92cb17eb971462074cfcc9b952bb466362
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+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  <keithp@keithp.com>
+commit e411de3d660a5382e7cb8d31fa2fa1bc35823931
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+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  <keithp@keithp.com>
+commit ce6709132a322e82e915b761c0ced1bc418095ea
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+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 <alan.coopersmith@sun.com>
+Date:   Tue Mar 20 13:16:18 2007 -0700
+
+    Coverity #750: print_xinput_info() returned without freeing storage "ext"
+
+commit c896552ee94cf50f8acfccc49096e5ec564e5356
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Mar 20 13:10:33 2007 -0700
+
+    Coverity #752: XListDepths return leaked in print_xrender_info()
+
+commit ea8455a0932c21ef29e97d469b492dadc85dabdc
+Author: Ingo Bormuth <ibormuth@efil.de>
+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 <alan.coopersmith@sun.com>
+Date:   Tue Mar 20 10:39:36 2007 -0700
+
+    Fix line wrapping of extensions list in usage message
+
+commit 91f465babd46f1b39c6f5665e38e4aab58fc921b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Mar 19 19:23:33 2007 -0700
+
+    Clear sparse warning: Using plain integer as NULL pointer
+
+commit 6a26c41570f1b91f14508cf3d44f4ed3c51127bd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Mar 19 19:15:18 2007 -0700
+
+    Fix typos in comments
+
+commit 752b793aa03b67eeff6b01c7f0bdb729f00bd49b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Mar 19 19:09:27 2007 -0700
+
+    Add support for checking sources with sparse/lint/etc.
+
+commit d66b154dce42319f73f4b0773e44c59c9cf9d7a6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Mar 19 18:53:38 2007 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 767fdebc77faf1b7322e7068a420a7fc2bf4a376
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+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 <kem@kem.org>
+Date:   Wed Dec 21 02:29:49 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 263521ee094a1b63fd5ffdd2f81bd4c511fdb479
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:43 2005 +0000
+
+    Stub COPYING files
+
+commit 74da6a6fdc7b90a779fab59811a162fe0571992c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:06 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 58e6b96a84164845b49112bf6d76def97e909ef1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:21 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d4cf291eff395b272590ba1415cdc5744dc39694
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:19 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit bdf02be37894b3e1b87437a8a0186fbd57f80e38
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+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 <anholt@freebsd.org>
+Date:   Mon Nov 21 10:34:59 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 1b28a57af4956be9a8e7d64dd5f0096ae43b3f6d
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:51 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit d91a0552a4b3c4f40e4b2ec10936c3f212a5d3bc
+Author: Kevin E Martin <kem@kem.org>
+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 <kem@kem.org>
+Date:   Wed Oct 19 02:47:53 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 4689eb41b6329fec24a7da63a203576b72b937da
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+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 <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:44 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 0df7213be00f90d227be44efbb60c8f2fdd712ff
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Aug 19 00:13:45 2005 +0000
+
+    More updates for Panoramix -> Xinerama rename
+
+commit 87e9acd02968882740bfbf51b68a1ef19584f371
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Aug 3 04:30:26 2005 +0000
+
+    More unique tokens for PKG_CHECK_MODULES
+
+commit 4fb83e624716886c60474f3bb443ffd730786889
+Author: Kevin E Martin <kem@kem.org>
+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 <ajax@nwnk.net>
+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 <daniel@fooishbar.org>
+Date:   Mon Jul 18 08:24:50 2005 +0000
+
+    Fail gracefully when extensions not present.
+
+commit 3b4cbb4fe34ff4de91ba6524d7750a2b55f5d67a
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Jul 9 23:36:22 2005 +0000
+
+    Add .cvsignore files
+
+commit 1e169a60adf7d9759d3b4a4dfb381043814e121a
+Author: Keith Packard <keithp@keithp.com>
+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 <keithp@keithp.com>
+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 <sandmann@daimi.au.dk>
+Date:   Wed Jul 6 19:56:47 2005 +0000
+
+    Add buildsystem for xdpyinfo
+
+commit 1b09e416dcaed59d319b295b933506a6f54fe918
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+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 <kem@freedesktop.org>.
+
+commit 5adf5a253e5434c2b0c2276ce3733cbb05282980
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+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 <julien.lafon@gmail.com> (MIT/X.org license).
+
+commit 4d275dcc29658972a3d7c2e72b812140819a10c3
+Author: Kevin E Martin <kem@kem.org>
+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 <krh@redhat.com>
+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 <kem@kem.org>
+Date:   Wed Jun 30 20:06:56 2004 +0000
+
+    Add Distributed Multihead X (DMX) support
+
+commit ec6b1eb0128635b465ba46761b5d9ba3377db0e8
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+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 <roland.mainz@nrubsig.org>
+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 <eich@suse.de>
+Date:   Fri Apr 23 19:54:43 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit cccbebfe7ee498cd8beae22831b50d570d623a94
+Author: Egbert Eich <eich@suse.de>
+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 <eich@suse.de>
+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 <eich@suse.de>
+Date:   Thu Feb 26 13:36:17 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit d3552b39fa600adbf6229fad2e3f651d18889178
+Author: Egbert Eich <eich@suse.de>
+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 <kaleb@freedesktop.org>
+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 <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:22 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 212617e163d792b20d025502f4138b6bdb7829a0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:53 2003 +0000
+
+    R6.6 is the Xorg base-line
diff --git a/app/xdpyinfo/Makefile.am b/app/xdpyinfo/Makefile.am
index cf93b6777..7284fa693 100644
--- a/app/xdpyinfo/Makefile.am
+++ b/app/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:man=@APP_MAN_SUFFIX@)
 
-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/app/xdpyinfo/Makefile.in b/app/xdpyinfo/Makefile.in
index bc3da538b..722e5cee6 100644
--- a/app/xdpyinfo/Makefile.in
+++ b/app/xdpyinfo/Makefile.in
@@ -176,6 +176,10 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -272,8 +276,9 @@ appman_PRE = \
 
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
 SED = sed
 
 # Strings to replace in man pages
@@ -293,6 +298,9 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
+@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@LINT_TRUE@		$(AM_CPPFLAGS) $(CPPFLAGS)
+
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -492,6 +500,9 @@ 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 \
@@ -621,6 +632,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
@@ -676,8 +688,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 .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 \
-	distclean-compile distclean-generic distclean-hdr \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-appmanDATA install-binPROGRAMS install-data \
@@ -690,8 +702,18 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 	uninstall-info-am
 
 
+.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
+
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+@LINT_TRUE@lint:
+@LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xdpyinfo_SOURCES)
 # 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:
diff --git a/app/xdpyinfo/aclocal.m4 b/app/xdpyinfo/aclocal.m4
index 5419cfb3c..48f9f8de2 100644
--- a/app/xdpyinfo/aclocal.m4
+++ b/app/xdpyinfo/aclocal.m4
@@ -1042,7 +1042,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
@@ -1191,7 +1191,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)
@@ -1463,14 +1467,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
diff --git a/app/xdpyinfo/configure b/app/xdpyinfo/configure
index ba6dcc52f..8759818d9 100644
--- a/app/xdpyinfo/configure
+++ b/app/xdpyinfo/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xdpyinfo 1.0.1.
+# Generated by GNU Autoconf 2.59 for xdpyinfo 1.0.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,11 +269,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xdpyinfo'
 PACKAGE_TARNAME='xdpyinfo'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='xdpyinfo 1.0.1'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='xdpyinfo 1.0.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XDPYINFO_CFLAGS XDPYINFO_LIBS DPY_X11_CFLAGS DPY_X11_LIBS DPY_XEXT_CFLAGS DPY_XEXT_LIBS DPY_XKB_CFLAGS DPY_XKB_LIBS DPY_XF86VIDMODE_CFLAGS DPY_XF86VIDMODE_LIBS DPY_XF86DGA_CFLAGS DPY_XF86DGA_LIBS DPY_XF86MISC_CFLAGS DPY_XF86MISC_LIBS DPY_XINPUT_CFLAGS DPY_XINPUT_LIBS DPY_XRENDER_CFLAGS DPY_XRENDER_LIBS DPY_XINERAMA_CFLAGS DPY_XINERAMA_LIBS DPY_DMX_CFLAGS DPY_DMX_LIBS DPY_XPRINT_CFLAGS DPY_XPRINT_LIBS DPY_XTST_CFLAGS DPY_XTST_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XDPYINFO_CFLAGS XDPYINFO_LIBS DPY_X11_CFLAGS DPY_X11_LIBS DPY_XEXT_CFLAGS DPY_XEXT_LIBS DPY_XKB_CFLAGS DPY_XKB_LIBS DPY_XF86VIDMODE_CFLAGS DPY_XF86VIDMODE_LIBS DPY_XF86DGA_CFLAGS DPY_XF86DGA_LIBS DPY_XF86MISC_CFLAGS DPY_XF86MISC_LIBS DPY_XINPUT_CFLAGS DPY_XINPUT_LIBS DPY_XRENDER_CFLAGS DPY_XRENDER_LIBS DPY_XINERAMA_CFLAGS DPY_XINERAMA_LIBS DPY_DMX_CFLAGS DPY_DMX_LIBS DPY_XPRINT_CFLAGS DPY_XPRINT_LIBS DPY_XTST_CFLAGS DPY_XTST_LIBS LINT LINT_FLAGS LINT_TRUE LINT_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -846,7 +846,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 xdpyinfo 1.0.1 to adapt to many kinds of systems.
+\`configure' configures xdpyinfo 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -912,7 +912,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdpyinfo 1.0.1:";;
+     short | recursive ) echo "Configuration of xdpyinfo 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -927,6 +927,11 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-dga           Disable dga support.
+  --without-xinerama      Disable xinerama support.
+  --without-dmx           Disable dmx support.
+  --with-lint             Use a lint-style source code checker (default:
+                          disabled)
   --with-release-version=STRING
                           Use release version string in package name
 
@@ -1090,7 +1095,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xdpyinfo configure 1.0.1
+xdpyinfo configure 1.0.3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1104,7 +1109,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xdpyinfo $as_me 1.0.1, which was
+It was created by xdpyinfo $as_me 1.0.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1702,7 +1707,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdpyinfo'
- VERSION='1.0.1'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3787,6 +3792,15 @@ done
 fi
 
 
+# Check whether --with-dga or --without-dga was given.
+if test "${with_dga+set}" = set; then
+  withval="$with_dga"
+  USE_DGA="$withval"
+else
+  USE_DGA="yes"
+fi;
+if test "x$USE_DGA" != "xno" ; then
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for DPY_XF86DGA" >&5
 echo $ECHO_N "checking for DPY_XF86DGA... $ECHO_C" >&6
@@ -3856,7 +3870,7 @@ else
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
 
 
 for ac_header in X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h
@@ -3920,10 +3934,14 @@ fi
 
 done
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
+		CPPFLAGS="$SAVE_CPPFLAGS"
+fi
+else
+	echo "without dga"
 fi
 
 
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for DPY_XF86MISC" >&5
 echo $ECHO_N "checking for DPY_XF86MISC... $ECHO_C" >&6
@@ -4331,6 +4349,15 @@ done
 fi
 
 
+# Check whether --with-xinerama or --without-xinerama was given.
+if test "${with_xinerama+set}" = set; then
+  withval="$with_xinerama"
+  USE_XINERAMA="$withval"
+else
+  USE_XINERAMA="yes"
+fi;
+if test "x$USE_XINERAMA" != "xno" ; then
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for DPY_XINERAMA" >&5
 echo $ECHO_N "checking for DPY_XINERAMA... $ECHO_C" >&6
@@ -4400,7 +4427,7 @@ else
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
 
 for ac_header in X11/extensions/Xinerama.h
 do
@@ -4462,9 +4489,21 @@ fi
 
 done
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
+		CPPFLAGS="$SAVE_CPPFLAGS"
 fi
+else
+	echo "without xinerama"
+fi
+
 
+# Check whether --with-dmx or --without-dmx was given.
+if test "${with_dmx+set}" = set; then
+  withval="$with_dmx"
+  USE_DMX="$withval"
+else
+  USE_DMX="yes"
+fi;
+if test "x$USE_DMX" != "xno" ; then
 
 pkg_failed=no
 echo "$as_me:$LINENO: checking for DPY_DMX" >&5
@@ -4535,7 +4574,7 @@ else
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
 
 for ac_header in X11/extensions/dmxext.h
 do
@@ -4597,7 +4636,10 @@ fi
 
 done
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
+		CPPFLAGS="$SAVE_CPPFLAGS"
+fi
+else
+	echo "without dmx"
 fi
 
 
@@ -4870,6 +4912,49 @@ done
 	CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 
+
+
+# Allow checking code with lint, sparse, etc.
+
+# Check whether --with-lint or --without-lint was given.
+if test "${with_lint+set}" = set; then
+  withval="$with_lint"
+  use_lint=$withval
+else
+  use_lint=no
+fi;
+if test "x$use_lint" = "xyes" ; then
+	LINT="lint"
+else
+	LINT="$use_lint"
+fi
+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
+    case $LINT in
+	lint|*/lint)
+	    case $host_os in
+		solaris*)
+			LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+			;;
+	    esac
+	    ;;
+    esac
+fi
+
+
+
+
+
+if test x$LINT != xno; then
+  LINT_TRUE=
+  LINT_FALSE='#'
+else
+  LINT_TRUE='#'
+  LINT_FALSE=
+fi
+
+
+
+
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -5015,7 +5100,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
@@ -5024,7 +5109,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
@@ -5148,6 +5233,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"LINT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -5419,7 +5511,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xdpyinfo $as_me 1.0.1, which was
+This file was extended by xdpyinfo $as_me 1.0.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5482,7 +5574,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xdpyinfo config.status 1.0.1
+xdpyinfo config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -5749,6 +5841,10 @@ s,@DPY_XPRINT_CFLAGS@,$DPY_XPRINT_CFLAGS,;t t
 s,@DPY_XPRINT_LIBS@,$DPY_XPRINT_LIBS,;t t
 s,@DPY_XTST_CFLAGS@,$DPY_XTST_CFLAGS,;t t
 s,@DPY_XTST_LIBS@,$DPY_XTST_LIBS,;t t
+s,@LINT@,$LINT,;t t
+s,@LINT_FLAGS@,$LINT_FLAGS,;t t
+s,@LINT_TRUE@,$LINT_TRUE,;t t
+s,@LINT_FALSE@,$LINT_FALSE,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
 s,@build_vendor@,$build_vendor,;t t
diff --git a/app/xdpyinfo/configure.ac b/app/xdpyinfo/configure.ac
index c9be18a6f..22bae817d 100644
--- a/app/xdpyinfo/configure.ac
+++ b/app/xdpyinfo/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xdpyinfo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdpyinfo)
+AC_INIT(xdpyinfo,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdpyinfo)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -57,13 +57,20 @@ PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
 	AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,,
-			 [#include <X11/Xlib.h>
+AC_ARG_WITH(dga, AC_HELP_STRING([--without-dga],[Disable dga support.]), 
+		[USE_DGA="$withval"], [USE_DGA="yes"])
+if test "x$USE_DGA" != "xno" ; then
+	PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, 
+		[SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
+		AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,,
+				 [#include <X11/Xlib.h>
 #include <X11/Xproto.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+		CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+	echo "without dga"
+fi
+
 
 PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
@@ -85,17 +92,29 @@ PKG_CHECK_MODULES(DPY_XRENDER, xrender,
 	AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XINERAMA, xinerama, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-PKG_CHECK_MODULES(DPY_DMX, dmx, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+AC_ARG_WITH(xinerama, AC_HELP_STRING([--without-xinerama],[Disable xinerama support.]),
+		[USE_XINERAMA="$withval"], [USE_XINERAMA="yes"])
+if test "x$USE_XINERAMA" != "xno" ; then
+	PKG_CHECK_MODULES(DPY_XINERAMA, xinerama, 
+		[SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
+		AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>])
+		CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+	echo "without xinerama"
+fi
+
+AC_ARG_WITH(dmx, AC_HELP_STRING([--without-dmx],[Disable dmx support.]),
+		[USE_DMX="$withval"], [USE_DMX="yes"])
+if test "x$USE_DMX" != "xno" ; then
+	PKG_CHECK_MODULES(DPY_DMX, dmx, 
+		[SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
+		AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>])
+		CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+	echo "without dmx"
+fi
 
 PKG_CHECK_MODULES(DPY_XPRINT, xp, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
@@ -109,6 +128,9 @@ PKG_CHECK_MODULES(DPY_XTST, xtst,
 	AC_CHECK_HEADERS([X11/extensions/record.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
diff --git a/app/xdpyinfo/xdpyinfo.c b/app/xdpyinfo/xdpyinfo.c
index 5bc348ac1..e9717b338 100644
--- a/app/xdpyinfo/xdpyinfo.c
+++ b/app/xdpyinfo/xdpyinfo.c
@@ -1,7 +1,7 @@
 /*
  * $Xorg: xdpyinfo.c,v 1.5 2001/02/09 02:05:41 xorgcvs Exp $
  * 
- * xdpyinfo - print information about X display connecton
+ * xdpyinfo - print information about X display connection
  *
  * 
 Copyright 1988, 1998  The Open Group
@@ -135,6 +135,14 @@ in this Software without prior written authorization from The Open Group.
 char *ProgramName;
 Bool queryExtensions = False;
 
+static int
+silent_errors(Display *dpy, XErrorEvent *ev)
+{
+    return 0;
+}
+
+static int (*old_handler)(Display *, XErrorEvent *) = NULL;
+
 static int print_event_mask(char *buf, int lastcol, int indent, long mask);
 
 static int StrCmp(const void *a, const  void *b)
@@ -424,6 +432,7 @@ Bool IsPrintScreen(Screen *s)
         pscreens = XpQueryScreens(dpy, &pscrcount);
         for( i = 0 ; (i < pscrcount) && pscreens ; i++ ) {
             if (s == pscreens[i]) {
+                XFree(pscreens);
                 return True;
             }
         }
@@ -438,7 +447,7 @@ print_screen_info(Display *dpy, int scr)
 {
     Screen *s = ScreenOfDisplay (dpy, scr);  /* opaque structure */
     XVisualInfo viproto;		/* fill in for getting info */
-    XVisualInfo *vip;			/* retured info */
+    XVisualInfo *vip;			/* returned info */
     int nvi;				/* number of elements returned */
     int i;				/* temp variable: iterator */
     char eventbuf[80];			/* want 79 chars per line + nul */
@@ -446,7 +455,7 @@ print_screen_info(Display *dpy, int scr)
     double xres, yres;
     int ndepths = 0, *depths = NULL;
     unsigned int width, height;
-    Bool isPrintScreen = False; /* Initalise this if |INCLUDE_XPRINT_SUPPORT| is not set */
+    Bool isPrintScreen = False; /* Initialise this if |INCLUDE_XPRINT_SUPPORT| is not set */
 
     /*
      * there are 2.54 centimeters to an inch; so there are 25.4 millimeters.
@@ -729,12 +738,16 @@ print_dga_info(Display *dpy, char *extname)
 	return 1;
     }
 
+    old_handler = XSetErrorHandler(silent_errors);
+
     if (!XF86DGAGetVideoLL(dpy, DefaultScreen(dpy), &offset,
 			    &width, &bank, &ram))
 	return 0;
     printf("  Base address = 0x%X, Width = %d, Bank size = %d,"
 	   " RAM size = %dk\n", offset, width, bank, ram);
 
+    XSetErrorHandler(old_handler);
+
     return 1;
 }
 #endif
@@ -765,7 +778,9 @@ print_XF86VidMode_info(Display *dpy, char *extname)
     if (!XF86VidModeGetMonitor(dpy, DefaultScreen(dpy), &monitor))
 	return 0;
     printf("  Monitor Information:\n");
-    printf("    Vendor: %s, Model: %s\n", monitor.vendor, monitor.model);
+    printf("    Vendor: %s, Model: %s\n", 
+	monitor.vendor == NULL ? "" : monitor.vendor,
+	monitor.model == NULL ? "" : monitor.model);
     printf("    Num hsync: %d, Num vsync: %d\n", monitor.nhsync, monitor.nvsync);
     for (i = 0; i < monitor.nhsync; i++) {
         printf("    hsync range %d: %6.2f - %6.2f\n", i, monitor.hsync[i].lo,
@@ -775,6 +790,10 @@ print_XF86VidMode_info(Display *dpy, char *extname)
         printf("    vsync range %d: %6.2f - %6.2f\n", i, monitor.vsync[i].lo,
                monitor.vsync[i].hi);
     }
+    XFree(monitor.vendor);
+    XFree(monitor.model);
+    XFree(monitor.hsync);
+    XFree(monitor.vsync);
 
     if ((majorrev > 0) || (majorrev == 0 && minorrev > 5)) {
       if (!XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &modecount,
@@ -800,6 +819,7 @@ print_XF86VidMode_info(Display *dpy, char *extname)
         if (modelines[i]->flags & V_DBLSCAN)   printf(" doublescan");
         printf("\n");
       }
+      XFree(modelines);
 
       if (!XF86VidModeGetModeLine(dpy, DefaultScreen(dpy),
 				  &dotclock, &modeline))
@@ -850,6 +870,8 @@ print_XF86Misc_info(Display *dpy, char *extname)
 	return 0;
     print_standard_extension_info(dpy, extname, majorrev, minorrev);
 
+    old_handler = XSetErrorHandler(silent_errors);
+
     if ((majorrev > 0) || (majorrev == 0 && minorrev > 0)) {
       if (!XF86MiscGetKbdSettings(dpy, &kbdinfo))
 	return 0;
@@ -861,6 +883,7 @@ print_XF86Misc_info(Display *dpy, char *extname)
 	return 0;
       printf("  Mouse Settings-       Device: %s, Type: ",
 	strlen(mouseinfo.device) == 0 ? "None": mouseinfo.device);
+      XFree(mouseinfo.device);
       if (mouseinfo.type == MTYPE_XQUEUE)
 	printf("Xqueue\n");
       else if (mouseinfo.type == MTYPE_OSMOUSE)
@@ -880,6 +903,8 @@ print_XF86Misc_info(Display *dpy, char *extname)
       printf("                        Buttons: %d\n", mouseinfo.buttons);
     }
 
+    XSetErrorHandler(old_handler);
+
     return 1;
 }
 #endif
@@ -986,6 +1011,7 @@ print_xinput_info(Display *dpy, char *extname)
 
   print_standard_extension_info(dpy, extname, ext->major_version,
 				ext->minor_version);
+  XFree(ext);
 
   extensions = XListExtensions(dpy, &num_extensions);
   for (loop = 0; loop < num_extensions &&
@@ -1006,6 +1032,16 @@ print_xinput_info(Display *dpy, char *extname)
 	  case IsXExtensionDevice:
 	      printf("XExtensionDevice]\n");
 	      break;
+#ifdef IsXExtensionKeyboard
+	  case IsXExtensionKeyboard:
+	      printf("XExtensionKeyboard]\n");
+	      break;
+#endif
+#ifdef IsXExtensionPointer
+	  case IsXExtensionPointer:
+	      printf("XExtensionPointer]\n");
+	      break;
+#endif
 	  default:
 	      printf("invalid value]\n");
 	      break;
@@ -1049,7 +1085,7 @@ print_xrender_info(Display *dpy, char *extname)
   XFreeExtensionList(extensions);
   if (loop != num_extensions) {
     printf ("  Render formats :\n");
-    for (count = 0; (pictform = XRenderFindFormat (dpy, 0, 0, count)); count++)
+    for (count = 0; (pictform = XRenderFindFormat (dpy, 0, NULL, count)); count++)
     {
       printf  ("  pict format:\n");
       printf  ("\tformat id:    0x%lx\n", pictform->id);
@@ -1120,6 +1156,7 @@ print_xrender_info(Display *dpy, char *extname)
 	for (count = 0; (pictform = XRenderFindFormat (dpy, PictFormatDepth, &templ, count)); count++)
 	  printf("       pict format id: 0x%lx\n", pictform->id);
       }
+      if (depths) XFree (depths);
     }
     return 1;
   }
@@ -1425,12 +1462,15 @@ print_known_extensions(FILE *f)
     int i, col;
     for (i = 0, col = 6; i < num_known_extensions; i++)
     {
-	if ((col += strlen(known_extensions[i].extname)+1) > 79)
+	int extlen = strlen(known_extensions[i].extname) + 1;
+	
+	if ((col + extlen) > 79)
 	{
 		col = 6;
 		fprintf(f, "\n     ");
 	}
 	fprintf(f, "%s ", known_extensions[i].extname);
+	col += extlen;
     }
 }
 
diff --git a/app/xdpyinfo/xdpyinfo.man b/app/xdpyinfo/xdpyinfo.man
index ca4326c32..d360c05e7 100644
--- a/app/xdpyinfo/xdpyinfo.man
+++ b/app/xdpyinfo/xdpyinfo.man
@@ -58,7 +58,13 @@ and the server is displayed.
 .B DISPLAY
 To get the default host, display number, and screen.
 .SH "SEE ALSO"
-X(__miscmansuffix__), xwininfo(1), xprop(1), xrdb(1)
+.IR X (__miscmansuffix__), 
+.IR xprop (__appmansuffix__),
+.IR xrdb (__appmansuffix__),
+.IR xwininfo (__appmansuffix__),
+.IR xdriinfo (__appmansuffix__),
+.IR xvinfo (__appmansuffix__), 
+.IR glxinfo (__appmansuffix__)
 .SH AUTHOR
 Jim Fulton, MIT X Consortium
 .br