jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* xset 1.0.4

This commit is contained in:
Julien Cristau 2008-03-07 20:29:03 +01:00
parent 6912cb7a7b
commit a7dc94904b
17 changed files with 2045 additions and 2173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

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

45
xset/ChangeLog
View File

@ -1,3 +1,48 @@
commit b6343fa846eeadb6736f383577b91dbb46d46971
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 15 18:11:25 2008 -0800
Delete duplicated #include statements
commit e92294748383b0eaca6cb7f3883cf909077963a1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 15 18:10:37 2008 -0800
Convert function declarations from K&R to ANSI C
commit 685fe4692583d383ffec8e0db52ea055fca0ed11
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 15 17:54:14 2008 -0800
Make code formatting consistent
Too many different indent styles/levels made code hard to read
commit 5dfbc61487623448c82d043c4f4f29d5e047d498
Author: gsr.bugs <gsr.bugs@infernal-iceberg.com>
Date: Thu Nov 15 00:04:34 2007 +0200
Manpage: Add mention of mouse acceleration with zero threshold
xset m A/B 0 gives a different behaviour, smooth acceleration, than typical
A/B C (C not zero) which is two speed. This behaviour is, for some people,
nice. But the point is that it is not documented in man page, so nobody
can just test it except if discovered due some reason more complex than read
the docs.
commit 6d56c1f8d25ce84c797c3b72070073bc44d1a7ac
Merge: c4f7c40... 3decc85...
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 06:02:50 2007 -0400
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/app/xset
commit c4f7c402ad52c784c01655b5d3a9d4d33c6598d6
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:51:47 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit 3decc85623f023a31b8c19526b29092a9f2d0357 commit 3decc85623f023a31b8c19526b29092a9f2d0357
Author: Alan Coopersmith <alan.coopersmith@sun.com> Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 27 16:37:20 2007 -0700 Date: Mon Aug 27 16:37:20 2007 -0700

236
xset/INSTALL
View File

@ -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.

138
xset/Makefile.in
View File

@ -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@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # 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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
@ -36,15 +36,11 @@
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c
@ -59,19 +55,18 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
bin_PROGRAMS = xset$(EXEEXT) bin_PROGRAMS = xset$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ $(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
mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
@ -81,7 +76,7 @@ am_xset_OBJECTS = xset.$(OBJEXT)
xset_OBJECTS = $(am_xset_OBJECTS) xset_OBJECTS = $(am_xset_OBJECTS)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
xset_DEPENDENCIES = $(am__DEPENDENCIES_1) xset_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I. DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -114,8 +109,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@ -138,6 +131,7 @@ ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -149,11 +143,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -181,9 +174,11 @@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XSET_CFLAGS = @XSET_CFLAGS@ XSET_CFLAGS = @XSET_CFLAGS@
XSET_LIBS = @XSET_LIBS@ XSET_LIBS = @XSET_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@ ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@
@ -195,6 +190,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@ build_cpu = @build_cpu@
build_os = @build_os@ build_os = @build_os@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
docdir = @docdir@ docdir = @docdir@
@ -222,8 +218,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE
xset_LDADD = $(XSET_LIBS) xset_LDADD = $(XSET_LIBS)
xset_SOURCES = \ xset_SOURCES = \
@ -298,7 +297,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1 config.h: stamp-h1
@if test ! -f $@; then \ @if test ! -f $@; then \
rm -f stamp-h1; \ rm -f stamp-h1; \
$(MAKE) stamp-h1; \ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@ -313,7 +312,7 @@ distclean-hdr:
-rm -f config.h stamp-h1 -rm -f config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \ if test -f $$p \
@ -336,7 +335,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
xset$(EXEEXT): $(xset_OBJECTS) $(xset_DEPENDENCIES) xset$(EXEEXT): $(xset_OBJECTS) $(xset_DEPENDENCIES)
@rm -f xset$(EXEEXT) @rm -f xset$(EXEEXT)
$(LINK) $(xset_LDFLAGS) $(xset_OBJECTS) $(xset_LDADD) $(LIBS) $(LINK) $(xset_OBJECTS) $(xset_LDADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -347,22 +346,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xset.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xset.Po@am__quote@
.c.o: .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@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $< @am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj: .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@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
uninstall-info-am:
install-appmanDATA: $(appman_DATA) install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)" test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
@list='$(appman_DATA)'; for p in $$list; do \ @list='$(appman_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \ f=$(am__strip_dir) \
@ -383,8 +381,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ 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 mkid -fID $$unique
tags: TAGS tags: TAGS
@ -396,8 +394,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ 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 \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \ test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@ -407,13 +405,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ 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" \ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique $$tags $$unique
@ -428,23 +425,22 @@ distclean-tags:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(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"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \ esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 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 \ if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \ fi; \
@ -461,7 +457,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -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 -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -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) || chmod -R a+r $(distdir)
dist-gzip: distdir dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@ -470,6 +466,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir) $(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-tarZ: distdir dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir) $(am__remove_distdir)
@ -497,6 +497,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \ *.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \ *.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \ *.shar.gz*) \
@ -536,7 +538,7 @@ distcheck: dist
$(am__remove_distdir) $(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \ @(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ 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: distuninstallcheck:
@cd $(distuninstallcheck_dir) \ @cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@ -560,7 +562,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) config.h all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs: installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-am install: install-am
install-exec: install-exec-am install-exec: install-exec-am
@ -611,12 +613,20 @@ info-am:
install-data-am: install-appmanDATA install-data-am: install-appmanDATA
install-dvi: install-dvi-am
install-exec-am: install-binPROGRAMS install-exec-am: install-binPROGRAMS
install-html: install-html-am
install-info: install-info-am install-info: install-info-am
install-man: install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
@ -638,23 +648,25 @@ ps: ps-am
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 \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
distclean 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 \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ 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
.PHONY: ChangeLog .PHONY: ChangeLog

202
xset/aclocal.m4 vendored
View File

@ -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, # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # 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 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. # 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 -*- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# #
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@ -79,14 +87,12 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# --------------------------------------------- # ---------------------------------------------
m4_define([_PKG_CONFIG], 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"
else elif test -n "$PKG_CONFIG"; then
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])
fi
else else
pkg_failed=untried pkg_failed=untried
fi[]dnl fi[]dnl
@ -132,9 +138,9 @@ See the pkg-config man page for more details.])
if test $pkg_failed = yes; then if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED _PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then 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 else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 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_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e '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}]) 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_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e '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 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 XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT= HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf) AC_PATH_PROG(PS2PDF, ps2pdf)
@ -637,14 +647,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`], [`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package]) [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 if test "x$PVM" = "x"; then
PVM="0" PVM="0"
fi fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM], [$PVM],
[Minor version of this package]) [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 if test "x$PVP" = "x"; then
PVP="0" PVP="0"
fi fi
@ -653,7 +663,7 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
[Patch version of this package]) [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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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 # Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y. # 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 # 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. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 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 -*- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
@ -727,14 +754,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*- # AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
# serial 7 # serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION) # AM_CONDITIONAL(NAME, SHELL-CONDITION)
# ------------------------------------- # -------------------------------------
@ -743,8 +770,10 @@ AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl [AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl [$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 if $2; then
$1_TRUE= $1_TRUE=
$1_FALSE='#' $1_FALSE='#'
@ -758,15 +787,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]]) Usually this means the macro was only invoked conditionally.]])
fi])]) fi])])
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # 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 # 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, # 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=], ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$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'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=]) [depcc="$$1" am_compiler_list=])
@ -859,6 +888,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err && >/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/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} 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 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -911,7 +941,8 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\' AMDEPBACKSLASH='\'
fi fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) 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 -*- # 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. # some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process # 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. # 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")` dirpart=`AS_DIRNAME("$mf")`
else else
continue continue
@ -996,14 +1028,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # 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 # 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. # your package does certain things. But this isn't really a big deal.
@ -1020,17 +1052,21 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf # arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support. # release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE], 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 Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about. dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
# test to see if srcdir already configured # test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" && if test -f $srcdir/config.status; then
test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi fi
fi
# test whether we have cygpath # test whether we have cygpath
if test -z "$CYGPATH_W"; then if test -z "$CYGPATH_W"; then
@ -1049,6 +1085,9 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])], AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl [_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([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@ -1084,6 +1123,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)], [_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX], [define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl 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. # our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers. [# Compute $1's index in $config_headers.
_am_arg=$1
_am_stamp_count=1 _am_stamp_count=1
for _am_header in $config_headers :; do for _am_header in $config_headers :; do
case $_am_header in case $_am_header in
$1 | $1:* ) $_am_arg | $_am_arg:* )
break ;; break ;;
* ) * )
_am_stamp_count=`expr $_am_stamp_count + 1` ;; _am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac esac
done 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. # 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. # Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH], AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl [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)]) AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc. # 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 -*- # 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. # Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
# serial 4 # serial 5
# AM_MISSING_PROG(NAME, PROGRAM) # 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. # If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN], AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL # Use eval to expand $SHELL
if eval "$MISSING --run true"; then if eval "$MISSING --run true"; then
@ -1259,7 +1304,7 @@ else
fi 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -1267,60 +1312,23 @@ fi
# AM_PROG_MKDIR_P # 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], 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 -*- # 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 if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :) AC_CHECK_TOOL([STRIP], [strip], :)
fi fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])]) 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 -*- # Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # Copyright (C) 2004, 2005 Free Software Foundation, Inc.

13
xset/autogen.sh Executable file
View File

@ -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 "$@"

142
xset/compile
View File

@ -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:

26
xset/config.guess vendored
View File

@ -1,10 +1,10 @@
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 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-07-22' timestamp='2008-01-08'
# This file is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by
@ -56,8 +56,8 @@ version="\
GNU config.guess ($timestamp) GNU config.guess ($timestamp)
Originally written by Per Bothner. 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 This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -532,7 +532,7 @@ EOF
echo rs6000-ibm-aix3.2 echo rs6000-ibm-aix3.2
fi fi
exit ;; exit ;;
*:AIX:*:[45]) *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 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 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000 IBM_ARCH=rs6000
@ -799,6 +799,9 @@ EOF
EM64T | authenticamd) EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE} echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;; exit ;;
IA64)
echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;; esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks echo i${UNAME_MACHINE}-pc-mks
@ -833,7 +836,14 @@ EOF
echo ${UNAME_MACHINE}-pc-minix echo ${UNAME_MACHINE}-pc-minix
exit ;; exit ;;
arm*:Linux:*:*) arm*:Linux:*:*)
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 echo ${UNAME_MACHINE}-unknown-linux-gnu
else
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
fi
exit ;; exit ;;
avr32*:Linux:*:*) avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -954,8 +964,8 @@ EOF
x86_64:Linux:*:*) x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu echo x86_64-unknown-linux-gnu
exit ;; exit ;;
xtensa:Linux:*:*) xtensa*:Linux:*:*)
echo xtensa-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;; exit ;;
i*86:Linux:*:*) i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so # The BFD linker knows what the default object file format is, so

44
xset/config.sub vendored
View File

@ -1,10 +1,10 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 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-06-28' timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME 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="\ version="\
GNU config.sub ($timestamp) 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 This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -369,10 +369,14 @@ case $basic_machine in
| v850-* | v850e-* | vax-* \ | v850-* | v850e-* | vax-* \
| we32k-* \ | we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \ | xstormy16-* | xtensa*-* \
| ymp-* \ | ymp-* \
| z8k-*) | 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 # Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS. # for a CPU type and a company and sometimes even an OS.
386bsd) 386bsd)
@ -443,6 +447,14 @@ case $basic_machine in
basic_machine=ns32k-sequent basic_machine=ns32k-sequent
os=-dynix os=-dynix
;; ;;
blackfin)
basic_machine=bfin-unknown
os=-linux
;;
blackfin-*)
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
c90) c90)
basic_machine=c90-cray basic_machine=c90-cray
os=-unicos os=-unicos
@ -668,6 +680,14 @@ case $basic_machine in
basic_machine=m68k-isi basic_machine=m68k-isi
os=-sysv os=-sysv
;; ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
m88k-omron*) m88k-omron*)
basic_machine=m88k-omron basic_machine=m88k-omron
;; ;;
@ -813,6 +833,14 @@ case $basic_machine in
basic_machine=i860-intel basic_machine=i860-intel
os=-osf os=-osf
;; ;;
parisc)
basic_machine=hppa-unknown
os=-linux
;;
parisc-*)
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
pbd) pbd)
basic_machine=sparc-tti basic_machine=sparc-tti
;; ;;
@ -1021,6 +1049,10 @@ case $basic_machine in
basic_machine=tic6x-unknown basic_machine=tic6x-unknown
os=-coff os=-coff
;; ;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
;;
tx39) tx39)
basic_machine=mipstx39-unknown basic_machine=mipstx39-unknown
;; ;;

231
xset/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for xset 1.0.3. # Generated by GNU Autoconf 2.61 for xset 1.0.4.
# #
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # 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. # Identity of this package.
PACKAGE_NAME='xset' PACKAGE_NAME='xset'
PACKAGE_TARNAME='xset' PACKAGE_TARNAME='xset'
PACKAGE_VERSION='1.0.3' PACKAGE_VERSION='1.0.4'
PACKAGE_STRING='xset 1.0.3' PACKAGE_STRING='xset 1.0.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL ac_subst_vars='SHELL
@ -618,6 +618,7 @@ target_alias
INSTALL_PROGRAM INSTALL_PROGRAM
INSTALL_SCRIPT INSTALL_SCRIPT
INSTALL_DATA INSTALL_DATA
am__isrc
CYGPATH_W CYGPATH_W
PACKAGE PACKAGE
VERSION VERSION
@ -1218,7 +1219,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures xset 1.0.3 to adapt to many kinds of systems. \`configure' configures xset 1.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1288,7 +1289,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of xset 1.0.3:";; short | recursive ) echo "Configuration of xset 1.0.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1406,7 +1407,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
xset configure 1.0.3 xset configure 1.0.4
generated by GNU Autoconf 2.61 generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1420,7 +1421,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by xset $as_me 1.0.3, which was It was created by xset $as_me 1.0.4, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@ $ $0 $@
@ -1773,7 +1774,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version="1.9" am__api_version='1.10'
ac_aux_dir= ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then if test -f "$ac_dir/install-sh"; then
@ -1956,38 +1958,53 @@ else
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi 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 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
# exists.
for d in ./-p ./--version;
do do
test -d $d && rmdir $d IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
'mkdir (fileutils) '4.1*)
ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
break 3;;
esac
done done
# $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. done
if test -f "$ac_aux_dir/mkinstalldirs"; then done
mkdir_p='$(mkinstalldirs)' IFS=$as_save_IFS
fi
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else 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
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 for ac_prog in gawk mawk nawk awk
do do
@ -2070,13 +2087,17 @@ else
fi fi
rmdir .tst 2>/dev/null rmdir .tst 2>/dev/null
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured # test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" && if test -f $srcdir/config.status; then
test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 { { 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;} echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
fi
# test whether we have cygpath # test whether we have cygpath
if test -z "$CYGPATH_W"; then if test -z "$CYGPATH_W"; then
@ -2090,7 +2111,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='xset' PACKAGE='xset'
VERSION='1.0.3' VERSION='1.0.4'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2118,7 +2139,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 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 # Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right # run `make install-strip'. However `strip' might not be the right
@ -2222,7 +2243,7 @@ else
fi fi
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 # We need awk for the "check" target. The system "awk" is bad on
# some platforms. # some platforms.
@ -2247,8 +2268,6 @@ fi
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } 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_TRUE=
MAINTAINER_MODE_FALSE='#' MAINTAINER_MODE_FALSE='#'
@ -3235,8 +3254,6 @@ if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp" am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\' AMDEPBACKSLASH='\'
fi fi
if test "x$enable_dependency_tracking" != xno; then if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE= AMDEP_TRUE=
AMDEP_FALSE='#' AMDEP_FALSE='#'
@ -3247,7 +3264,6 @@ fi
depcc="$CC" am_compiler_list= depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@ -3315,6 +3331,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err && >/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/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} 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 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -3344,8 +3361,6 @@ fi
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if if
test "x$enable_dependency_tracking" != xno \ test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
@ -3661,10 +3676,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XSET" >&5 { echo "$as_me:$LINENO: checking for XSET" >&5
echo $ECHO_N "checking for XSET... $ECHO_C" >&6; } echo $ECHO_N "checking for XSET... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$XSET_CFLAGS"; then if test -n "$XSET_CFLAGS"; then
pkg_cv_XSET_CFLAGS="$XSET_CFLAGS" pkg_cv_XSET_CFLAGS="$XSET_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu\"") >&5
($PKG_CONFIG --exists --print-errors "xmuu") 2>&5 ($PKG_CONFIG --exists --print-errors "xmuu") 2>&5
@ -3675,14 +3689,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$XSET_LIBS"; then if test -n "$XSET_LIBS"; then
pkg_cv_XSET_LIBS="$XSET_LIBS" pkg_cv_XSET_LIBS="$XSET_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu\"") >&5
($PKG_CONFIG --exists --print-errors "xmuu") 2>&5 ($PKG_CONFIG --exists --print-errors "xmuu") 2>&5
@ -3693,7 +3705,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -3708,9 +3719,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
XSET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu"` XSET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu" 2>&1`
else else
XSET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu"` XSET_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$XSET_PKG_ERRORS" >&5 echo "$XSET_PKG_ERRORS" >&5
@ -3774,10 +3785,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_X11" >&5 { echo "$as_me:$LINENO: checking for SET_X11" >&5
echo $ECHO_N "checking for SET_X11... $ECHO_C" >&6; } echo $ECHO_N "checking for SET_X11... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$SET_X11_CFLAGS"; then if test -n "$SET_X11_CFLAGS"; then
pkg_cv_SET_X11_CFLAGS="$SET_X11_CFLAGS" pkg_cv_SET_X11_CFLAGS="$SET_X11_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5
@ -3788,14 +3798,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$SET_X11_LIBS"; then if test -n "$SET_X11_LIBS"; then
pkg_cv_SET_X11_LIBS="$SET_X11_LIBS" pkg_cv_SET_X11_LIBS="$SET_X11_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5
@ -3806,7 +3814,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -3821,9 +3828,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
SET_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` SET_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
else else
SET_X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` SET_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SET_X11_PKG_ERRORS" >&5 echo "$SET_X11_PKG_ERRORS" >&5
@ -3886,10 +3893,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_XEXT" >&5 { echo "$as_me:$LINENO: checking for SET_XEXT" >&5
echo $ECHO_N "checking for SET_XEXT... $ECHO_C" >&6; } echo $ECHO_N "checking for SET_XEXT... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XEXT_CFLAGS"; then if test -n "$SET_XEXT_CFLAGS"; then
pkg_cv_SET_XEXT_CFLAGS="$SET_XEXT_CFLAGS" pkg_cv_SET_XEXT_CFLAGS="$SET_XEXT_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5
($PKG_CONFIG --exists --print-errors "xext") 2>&5 ($PKG_CONFIG --exists --print-errors "xext") 2>&5
@ -3900,14 +3906,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XEXT_LIBS"; then if test -n "$SET_XEXT_LIBS"; then
pkg_cv_SET_XEXT_LIBS="$SET_XEXT_LIBS" pkg_cv_SET_XEXT_LIBS="$SET_XEXT_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5
($PKG_CONFIG --exists --print-errors "xext") 2>&5 ($PKG_CONFIG --exists --print-errors "xext") 2>&5
@ -3918,7 +3922,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -3933,9 +3936,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
SET_XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xext"` SET_XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xext" 2>&1`
else else
SET_XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"` SET_XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xext" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SET_XEXT_PKG_ERRORS" >&5 echo "$SET_XEXT_PKG_ERRORS" >&5
@ -4019,10 +4022,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_XKB" >&5 { echo "$as_me:$LINENO: checking for SET_XKB" >&5
echo $ECHO_N "checking for SET_XKB... $ECHO_C" >&6; } echo $ECHO_N "checking for SET_XKB... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XKB_CFLAGS"; then if test -n "$SET_XKB_CFLAGS"; then
pkg_cv_SET_XKB_CFLAGS="$SET_XKB_CFLAGS" pkg_cv_SET_XKB_CFLAGS="$SET_XKB_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5
@ -4033,14 +4035,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XKB_LIBS"; then if test -n "$SET_XKB_LIBS"; then
pkg_cv_SET_XKB_LIBS="$SET_XKB_LIBS" pkg_cv_SET_XKB_LIBS="$SET_XKB_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5
@ -4051,7 +4051,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -4066,9 +4065,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
SET_XKB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` SET_XKB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
else else
SET_XKB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` SET_XKB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SET_XKB_PKG_ERRORS" >&5 echo "$SET_XKB_PKG_ERRORS" >&5
@ -4151,10 +4150,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_XF86MISC" >&5 { echo "$as_me:$LINENO: checking for SET_XF86MISC" >&5
echo $ECHO_N "checking for SET_XF86MISC... $ECHO_C" >&6; } echo $ECHO_N "checking for SET_XF86MISC... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XF86MISC_CFLAGS"; then if test -n "$SET_XF86MISC_CFLAGS"; then
pkg_cv_SET_XF86MISC_CFLAGS="$SET_XF86MISC_CFLAGS" pkg_cv_SET_XF86MISC_CFLAGS="$SET_XF86MISC_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xxf86misc\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xxf86misc\"") >&5
($PKG_CONFIG --exists --print-errors "xxf86misc") 2>&5 ($PKG_CONFIG --exists --print-errors "xxf86misc") 2>&5
@ -4165,14 +4163,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XF86MISC_LIBS"; then if test -n "$SET_XF86MISC_LIBS"; then
pkg_cv_SET_XF86MISC_LIBS="$SET_XF86MISC_LIBS" pkg_cv_SET_XF86MISC_LIBS="$SET_XF86MISC_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xxf86misc\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xxf86misc\"") >&5
($PKG_CONFIG --exists --print-errors "xxf86misc") 2>&5 ($PKG_CONFIG --exists --print-errors "xxf86misc") 2>&5
@ -4183,7 +4179,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -4198,9 +4193,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
SET_XF86MISC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xxf86misc"` SET_XF86MISC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xxf86misc" 2>&1`
else else
SET_XF86MISC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xxf86misc"` SET_XF86MISC_PKG_ERRORS=`$PKG_CONFIG --print-errors "xxf86misc" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SET_XF86MISC_PKG_ERRORS" >&5 echo "$SET_XF86MISC_PKG_ERRORS" >&5
@ -4285,10 +4280,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_FONTCACHE" >&5 { echo "$as_me:$LINENO: checking for SET_FONTCACHE" >&5
echo $ECHO_N "checking for SET_FONTCACHE... $ECHO_C" >&6; } echo $ECHO_N "checking for SET_FONTCACHE... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$SET_FONTCACHE_CFLAGS"; then if test -n "$SET_FONTCACHE_CFLAGS"; then
pkg_cv_SET_FONTCACHE_CFLAGS="$SET_FONTCACHE_CFLAGS" pkg_cv_SET_FONTCACHE_CFLAGS="$SET_FONTCACHE_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfontcache\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfontcache\"") >&5
($PKG_CONFIG --exists --print-errors "xfontcache") 2>&5 ($PKG_CONFIG --exists --print-errors "xfontcache") 2>&5
@ -4299,14 +4293,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$SET_FONTCACHE_LIBS"; then if test -n "$SET_FONTCACHE_LIBS"; then
pkg_cv_SET_FONTCACHE_LIBS="$SET_FONTCACHE_LIBS" pkg_cv_SET_FONTCACHE_LIBS="$SET_FONTCACHE_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfontcache\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfontcache\"") >&5
($PKG_CONFIG --exists --print-errors "xfontcache") 2>&5 ($PKG_CONFIG --exists --print-errors "xfontcache") 2>&5
@ -4317,7 +4309,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -4332,9 +4323,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
SET_FONTCACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfontcache"` SET_FONTCACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfontcache" 2>&1`
else else
SET_FONTCACHE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfontcache"` SET_FONTCACHE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfontcache" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SET_FONTCACHE_PKG_ERRORS" >&5 echo "$SET_FONTCACHE_PKG_ERRORS" >&5
@ -4418,10 +4409,9 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SET_XPRINT" >&5 { echo "$as_me:$LINENO: checking for SET_XPRINT" >&5
echo $ECHO_N "checking for SET_XPRINT... $ECHO_C" >&6; } echo $ECHO_N "checking for SET_XPRINT... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XPRINT_CFLAGS"; then if test -n "$SET_XPRINT_CFLAGS"; then
pkg_cv_SET_XPRINT_CFLAGS="$SET_XPRINT_CFLAGS" pkg_cv_SET_XPRINT_CFLAGS="$SET_XPRINT_CFLAGS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
($PKG_CONFIG --exists --print-errors "xp") 2>&5 ($PKG_CONFIG --exists --print-errors "xp") 2>&5
@ -4432,14 +4422,12 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then
if test -n "$SET_XPRINT_LIBS"; then if test -n "$SET_XPRINT_LIBS"; then
pkg_cv_SET_XPRINT_LIBS="$SET_XPRINT_LIBS" pkg_cv_SET_XPRINT_LIBS="$SET_XPRINT_LIBS"
else elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5 { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
($PKG_CONFIG --exists --print-errors "xp") 2>&5 ($PKG_CONFIG --exists --print-errors "xp") 2>&5
@ -4450,7 +4438,6 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi
else else
pkg_failed=untried pkg_failed=untried
fi fi
@ -4465,9 +4452,9 @@ else
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
SET_XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xp"` SET_XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
else else
SET_XPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xp"` SET_XPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$SET_XPRINT_PKG_ERRORS" >&5 echo "$SET_XPRINT_PKG_ERRORS" >&5
@ -4725,7 +4712,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF _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 if test "x$PVM" = "x"; then
PVM="0" PVM="0"
fi fi
@ -4734,7 +4721,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM #define PACKAGE_VERSION_MINOR $PVM
_ACEOF _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 if test "x$PVP" = "x"; then
PVP="0" PVP="0"
fi fi
@ -5164,7 +5151,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by xset $as_me 1.0.3, which was This file was extended by xset $as_me 1.0.4, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -5217,7 +5204,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
xset config.status 1.0.3 xset config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.61, configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -5228,6 +5215,7 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd' ac_pwd='$ac_pwd'
srcdir='$srcdir' srcdir='$srcdir'
INSTALL='$INSTALL' INSTALL='$INSTALL'
MKDIR_P='$MKDIR_P'
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF
@ -5435,6 +5423,7 @@ target_alias!$target_alias$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim
am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim VERSION!$VERSION$ac_delim
@ -5491,7 +5480,6 @@ build!$build$ac_delim
build_cpu!$build_cpu$ac_delim build_cpu!$build_cpu$ac_delim
build_vendor!$build_vendor$ac_delim build_vendor!$build_vendor$ac_delim
build_os!$build_os$ac_delim build_os!$build_os$ac_delim
host!$host$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -5533,6 +5521,7 @@ _ACEOF
ac_delim='%!_!# ' ac_delim='%!_!# '
for ac_last_try in false false false false false :; do for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF cat >conf$$subs.sed <<_ACEOF
host!$host$ac_delim
host_cpu!$host_cpu$ac_delim host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim host_os!$host_os$ac_delim
@ -5552,7 +5541,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@ -5779,6 +5768,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac esac
ac_MKDIR_P=$MKDIR_P
case $MKDIR_P in
[\\/$]* | ?:[\\/]* ) ;;
*/*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
esac
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF
@ -5832,6 +5826,7 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack $ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@ -5947,21 +5942,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
fi fi
rm -f "$tmp/out12" rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers. # Compute $ac_file's index in $config_headers.
_am_arg=$ac_file
_am_stamp_count=1 _am_stamp_count=1
for _am_header in $config_headers :; do for _am_header in $config_headers :; do
case $_am_header in case $_am_header in
$ac_file | $ac_file:* ) $_am_arg | $_am_arg:* )
break ;; break ;;
* ) * )
_am_stamp_count=`expr $_am_stamp_count + 1` ;; _am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac esac
done 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\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/ s//\1/
q q
@ -5996,8 +5992,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
# some people rename them; so instead we look at the file content. # some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process # 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. # 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" || dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)[^/]' \| \

2
xset/configure.ac
View File

@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57]) AC_PREREQ([2.57])
AC_INIT(xset,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset) AC_INIT(xset,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset)
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

93
xset/depcomp
View File

@ -1,9 +1,10 @@
#! /bin/sh #! /bin/sh
# depcomp - compile a program generating dependencies as side-effects # 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 # 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 # 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 ## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm. ## 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=$? stat=$?
if test $stat -eq 0; then : if test $stat -eq 0; then :
else else
@ -201,34 +215,39 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the # current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information. # start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases. # 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 if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M "$@" -Wc,-M
else else
tmpdepfile1=$dir$base.u
tmpdepfile2=$dir$base.u
tmpdepfile3=$dir$base.u
"$@" -M "$@" -M
fi fi
stat=$? stat=$?
if test -f "$tmpdepfile"; then :
else
stripped=`echo "$stripped" | sed 's,^.*/,,'`
tmpdepfile="$stripped.u"
fi
if test $stat -eq 0; then : if test $stat -eq 0; then :
else else
rm -f "$tmpdepfile" rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat exit $stat
fi fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then if test -f "$tmpdepfile"; then
outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'. # Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to # Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'. # `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^$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 else
# The sourcefile does not contain any dependencies, so just # The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile # store a dummy comment line, to avoid errors with the Makefile
@ -276,6 +295,46 @@ icc)
rm -f "$tmpdepfile" 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) tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side # The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -288,13 +347,13 @@ tru64)
if test "$libtool" = yes; then if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a # 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. # 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.4, dependencies were output in $dir.libs/$base.lo.d.
# #
# With libtool 1.5 this exception was removed, and libtool now # With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two # 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 # in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer # 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 # $dir$base.o.d over $dir.libs/$base.o.d because the latter is

444
xset/install-sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# install - install a program, script, or datafile # 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 # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # 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. # when there is no Makefile.
# #
# This script is compatible with the BSD install script, but was written # 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 # set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it. # 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= chgrpcmd=
stripcmd= chmodcmd=$chmodprog
chowncmd=
mvcmd=$mvprog
rmcmd="$rmprog -f" rmcmd="$rmprog -f"
mvcmd="$mvprog" stripcmd=
src= src=
dst= dst=
dir_arg= dir_arg=
dstarg= dst_arg=
copy_on_change=false
no_target_directory= 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]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES... or: $0 [OPTION]... -d DIRECTORIES...
@ -80,7 +110,11 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES. In the 4th, create DIRECTORIES.
Options: Options:
--help display this help and exit.
--version display version info and exit.
-c (ignored) -c (ignored)
-C install only if different (preserve the last data modification time)
-d create directories instead of installing files. -d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP. -g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE. -m MODE $chmodprog installed files to MODE.
@ -88,73 +122,74 @@ Options:
-s $stripprog installed files. -s $stripprog installed files.
-t DIRECTORY install into DIRECTORY. -t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory. -T report an error if DSTFILE is a directory.
--help display this help and exit.
--version display version info and exit.
Environment variables override the default commands: 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 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" -g) chgrpcmd="$chgrpprog $2"
shift shift;;
shift
continue;;
--help) echo "$usage"; exit $?;; --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" -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 $?;; --version) echo "$0 $scriptversion"; exit $?;;
*) # When -d is used, all remaining arguments are directories to create. --) shift
break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac
shift
done
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. # 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 $@. # Otherwise, the last argument is the destination. Remove it from $@.
for arg for arg
do do
if test -n "$dstarg"; then if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg. # $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg" set fnord "$@" "$dst_arg"
shift # fnord shift # fnord
fi fi
shift # arg shift # arg
dstarg=$arg dst_arg=$arg
done
break;;
esac
done done
fi
if test -z "$1"; then if test $# -eq 0; then
if test -z "$dir_arg"; then if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2 echo "$0: no input file specified." >&2
exit 1 exit 1
@ -164,6 +199,33 @@ if test -z "$1"; then
exit 0 exit 0
fi 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 for src
do do
# Protect names starting with `-'. # Protect names starting with `-'.
@ -173,15 +235,11 @@ do
if test -n "$dir_arg"; then if test -n "$dir_arg"; then
dst=$src dst=$src
src= dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
else
if test -d "$dst"; then
mkdircmd=:
chmodcmd=
else
mkdircmd=$mkdirprog
fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad # might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'. # if $src (and thus $dsttmp) contains '*'.
@ -190,12 +248,12 @@ do
exit 1 exit 1
fi fi
if test -z "$dstarg"; then if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2 echo "$0: no destination specified." >&2
exit 1 exit 1
fi fi
dst=$dstarg dst=$dst_arg
# Protect names starting with `-'. # Protect names starting with `-'.
case $dst in case $dst in
-*) dst=./$dst;; -*) dst=./$dst;;
@ -205,56 +263,184 @@ do
# if double slashes aren't ignored. # if double slashes aren't ignored.
if test -d "$dst"; then if test -d "$dst"; then
if test -n "$no_target_directory"; 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 exit 1
fi 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
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
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
mkdir_mode=
fi
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
if (umask $mkdir_umask &&
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 oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason. IFS=/
IFS='%' $posix_glob set -f
set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` set fnord $dstdir
shift shift
$posix_glob set +f
IFS=$oIFS IFS=$oIFS
pathcomp= prefixes=
while test $# -ne 0 ; do for d
pathcomp=$pathcomp$1 do
shift test -z "$d" && continue
if test ! -d "$pathcomp"; then
$mkdirprog "$pathcomp" prefix=$prefix$d
# mkdir can fail with a `File exist' error in case several if test -d "$prefix"; then
# install-sh are creating the directory concurrently. This prefixes=
# is OK. else
test -d "$pathcomp" || exit 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
pathcomp=$pathcomp/ fi
prefix=$prefix/
done 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
fi
fi fi
if test -n "$dir_arg"; then 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 else
dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory. # Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_ dsttmp=$dstdir/_inst.$$_
@ -262,10 +448,9 @@ do
# Trap to clean up those temp files at exit. # Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name. # 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. # and set any options; do chmod last to preserve setuid bits.
# #
@ -273,47 +458,58 @@ do
# ignore errors from any of these, just make sure not to ignore # ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command. # 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"; } &&
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
eval "$initialize_posix_glob" &&
$posix_glob set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
$posix_glob set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
# Now rename the file to the real destination.
{ $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else # The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not # to itself, or perhaps because mv is so ancient that it does not
# support -f. # support -f.
{
# Now remove or move aside any old file at destination location. # Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some # We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other # systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new # reasons. In this case, the final cleanup might fail but the new
# file should still install successfully. # file should still install successfully.
{ {
if test -f "$dstdir/$dstfile"; then test ! -f "$dst" ||
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ $doit $rmcmd -f "$dst" 2>/dev/null ||
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|| { { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 } ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1 (exit 1); exit 1
} }
else
:
fi
} && } &&
# Now rename the file to the real destination. # Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile" $doit $mvcmd "$dsttmp" "$dst"
} }
} fi || exit 1
fi || { (exit 1); exit 1; }
done
# The final little trick to "correctly" pass the exit status to the exit trap. trap '' 0
{ fi
(exit 0); exit 0 done
}
# Local variables: # Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)

61
xset/missing
View File

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

158
xset/mkinstalldirs
View File

@ -1,158 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
scriptversion=2005-06-29.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec 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.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
for d
do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# 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:

389
xset/xset.c
View File

@ -94,16 +94,6 @@ in this Software without prior written authorization from The Open Group.
# endif # endif
#endif /* DPMSExtension */ #endif /* DPMSExtension */
#include <X11/Xos.h>
#include <X11/Xfuncs.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <X11/Xmu/Error.h>
#ifdef MITMISC
#include <X11/extensions/MITMisc.h>
#endif
#ifdef XF86MISC #ifdef XF86MISC
# include <X11/extensions/xf86misc.h> # include <X11/extensions/xf86misc.h>
# include <X11/extensions/xf86mscstr.h> # include <X11/extensions/xf86mscstr.h>
@ -175,6 +165,7 @@ static void query(Display *dpy);
static void usage(char *fmt, ...); static void usage(char *fmt, ...);
static void error(char *message); static void error(char *message);
static int local_xerror(Display *dpy, XErrorEvent *rep); static int local_xerror(Display *dpy, XErrorEvent *rep);
#ifdef XF86MISC #ifdef XF86MISC
static void set_repeatrate(Display *dpy, int delay, int rate); static void set_repeatrate(Display *dpy, int delay, int rate);
#endif #endif
@ -189,11 +180,13 @@ register char *arg;
register int i; register int i;
int percent; int percent;
int acc_num, acc_denom, threshold; int acc_num, acc_denom, threshold;
#ifdef DPMSExtension #ifdef DPMSExtension
CARD16 standby_timeout, suspend_timeout, off_timeout; CARD16 standby_timeout, suspend_timeout, off_timeout;
#endif #endif
int key, auto_repeat_mode; int key, auto_repeat_mode;
XKeyboardControl values; XKeyboardControl values;
#define MAX_PIXEL_COUNT 512 #define MAX_PIXEL_COUNT 512
unsigned long pixels[MAX_PIXEL_COUNT]; unsigned long pixels[MAX_PIXEL_COUNT];
caddr_t colors[MAX_PIXEL_COUNT]; caddr_t colors[MAX_PIXEL_COUNT];
@ -201,6 +194,7 @@ int numpixels = 0;
char *disp = NULL; char *disp = NULL;
Display *dpy; Display *dpy;
Bool hasargs = False; Bool hasargs = False;
#ifdef XF86MISC #ifdef XF86MISC
int miscpresent = 1; int miscpresent = 1;
int major, minor; int major, minor;
@ -222,7 +216,8 @@ progName = argv[0];
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
arg = argv[i]; arg = argv[i];
if (strcmp(arg, "-display") == 0 || strcmp(arg, "-d") == 0) { if (strcmp(arg, "-display") == 0 || strcmp(arg, "-d") == 0) {
if (++i >= argc) usage ("missing argument to -display", NULL); if (++i >= argc)
usage("missing argument to -display", NULL);
disp = argv[i]; disp = argv[i];
} else { } else {
hasargs = True; hasargs = True;
@ -244,10 +239,11 @@ for (i = 1; i < argc; ) {
if (strcmp(arg, "-display") == 0 || strcmp(arg, "-d") == 0) { if (strcmp(arg, "-display") == 0 || strcmp(arg, "-d") == 0) {
++i; /* already dealt with */ ++i; /* already dealt with */
continue; continue;
} else if (*arg == '-' && *(arg + 1) == 'c'){ /* Does arg start with "-c"? */ } else if (*arg == '-' && *(arg + 1) == 'c') { /* Does arg start
set_click(dpy, 0); /* If so, turn click off and */ with "-c"? */
} set_click(dpy, 0); /* If so, turn click off */
else if (*arg == 'c') { /* Well, does it start with "c", then? */ } else if (*arg == 'c') { /* Well, does it start
with "c", then? */
percent = SERVER_DEFAULT; /* Default click volume. */ percent = SERVER_DEFAULT; /* Default click volume. */
if (i >= argc) { if (i >= argc) {
set_click(dpy, percent); /* set click to default */ set_click(dpy, percent); /* set click to default */
@ -257,21 +253,17 @@ for (i = 1; i < argc; ) {
if (strcmp(arg, "on") == 0) { /* Let click be default. */ if (strcmp(arg, "on") == 0) { /* Let click be default. */
percent = DEFAULT_ON; percent = DEFAULT_ON;
i++; i++;
} } else if (strcmp(arg, "off") == 0) {
else if (strcmp(arg, "off") == 0) {
percent = 0; /* Turn it off. */ percent = 0; /* Turn it off. */
i++; i++;
} } else if (is_number(arg, 100)) {
else if (is_number(arg, 100)) {
percent = atoi(arg); /* Set to spec. volume */ percent = atoi(arg); /* Set to spec. volume */
i++; i++;
} }
set_click(dpy, percent); set_click(dpy, percent);
} } else if (strcmp(arg, "-b") == 0) {
else if (strcmp(arg, "-b") == 0) {
set_bell_vol(dpy, 0); /* Then turn off bell. */ set_bell_vol(dpy, 0); /* Then turn off bell. */
} } else if (strcmp(arg, "b") == 0) {
else if (strcmp(arg, "b") == 0) {
percent = SERVER_DEFAULT; /* Set bell to default. */ percent = SERVER_DEFAULT; /* Set bell to default. */
if (i >= argc) { if (i >= argc) {
set_bell_vol(dpy, percent); /* set bell to default */ set_bell_vol(dpy, percent); /* set bell to default */
@ -285,13 +277,11 @@ for (i = 1; i < argc; ) {
set_bell_pitch(dpy, percent); /* set pitch to default */ set_bell_pitch(dpy, percent); /* set pitch to default */
set_bell_dur(dpy, percent); /* set duration to default */ set_bell_dur(dpy, percent); /* set duration to default */
i++; i++;
} } else if (strcmp(arg, "off") == 0) {
else if (strcmp(arg, "off") == 0) {
percent = 0; /* Turn the bell off. */ percent = 0; /* Turn the bell off. */
set_bell_vol(dpy, percent); set_bell_vol(dpy, percent);
i++; i++;
} } else if (is_number(arg, 100)) { /* If volume is given: */
else if (is_number(arg, 100)) { /* If volume is given: */
percent = atoi(arg); /* set bell appropriately. */ percent = atoi(arg); /* set bell appropriately. */
set_bell_vol(dpy, percent); set_bell_vol(dpy, percent);
i++; i++;
@ -307,37 +297,41 @@ for (i = 1; i < argc; ) {
i++; i++;
} }
} }
} } else
else
set_bell_vol(dpy, percent); /* set bell to default */ set_bell_vol(dpy, percent); /* set bell to default */
} }
#ifdef MITMISC #ifdef MITMISC
else if (strcmp(arg, "bc") == 0) { else if (strcmp(arg, "bc") == 0) {
int dummy; int dummy;
if (XMITMiscQueryExtension(dpy, &dummy, &dummy)) if (XMITMiscQueryExtension(dpy, &dummy, &dummy))
XMITMiscSetBugMode(dpy, True); XMITMiscSetBugMode(dpy, True);
else else
fprintf(stderr, "server does not have extension for bc option\n"); fprintf(stderr,
} "server does not have extension for bc option\n");
else if (strcmp(arg, "-bc") == 0) { } else if (strcmp(arg, "-bc") == 0) {
int dummy; int dummy;
if (XMITMiscQueryExtension(dpy, &dummy, &dummy)) if (XMITMiscQueryExtension(dpy, &dummy, &dummy))
XMITMiscSetBugMode(dpy, False); XMITMiscSetBugMode(dpy, False);
else else
fprintf(stderr, "server does not have extension for -bc option\n"); fprintf(stderr,
"server does not have extension for -bc option\n");
} }
#endif #endif
#ifdef FONTCACHE #ifdef FONTCACHE
else if (strcmp(arg, "fc") == 0) { else if (strcmp(arg, "fc") == 0) {
int dummy; int dummy;
FontCacheSettings cs; FontCacheSettings cs;
if (FontCacheQueryExtension(dpy, &dummy, &dummy)) { if (FontCacheQueryExtension(dpy, &dummy, &dummy)) {
FontCacheGetCacheSettings(dpy, &cs); FontCacheGetCacheSettings(dpy, &cs);
himark = cs.himark / 1024; himark = cs.himark / 1024;
lowmark = cs.lowmark / 1024; lowmark = cs.lowmark / 1024;
balance = cs.balance; balance = cs.balance;
if (i >= argc) { if (i >= argc) {
/* Set to server's values, and clear all cache in side effect */ /* Set to server's values, and clear all cache
in side effect */
set_font_cache(dpy, himark, lowmark, balance); set_font_cache(dpy, himark, lowmark, balance);
break; break;
} }
@ -361,7 +355,8 @@ for (i = 1; i < argc; ) {
usage("low-mark must be greater than 0", NULL); usage("low-mark must be greater than 0", NULL);
} }
if (himark <= lowmark) { if (himark <= lowmark) {
usage("hi-mark must be greater than low-mark", NULL); usage("hi-mark must be greater than low-mark",
NULL);
} }
if (i >= argc) { if (i >= argc) {
set_font_cache(dpy, himark, lowmark, balance); set_font_cache(dpy, himark, lowmark, balance);
@ -377,22 +372,27 @@ for (i = 1; i < argc; ) {
set_font_cache(dpy, himark, lowmark, balance); set_font_cache(dpy, himark, lowmark, balance);
} }
} }
} else if (strcmp(arg, "s") == 0 || strcmp(arg, "status") == 0) { } else if (strcmp(arg, "s") == 0
|| strcmp(arg, "status") == 0) {
/* display cache status */ /* display cache status */
query_cache_status(dpy); query_cache_status(dpy);
} }
} else { } else {
fprintf(stderr, "server does not have extension for fc option\n"); fprintf(stderr,
"server does not have extension for fc option\n");
} }
} }
#endif #endif
#ifdef BUILD_PRINTSUPPORT #ifdef BUILD_PRINTSUPPORT
else if (strcmp(arg, "rehashprinterlist") == 0) { /* rehash list of printers */ else if (strcmp(arg, "rehashprinterlist") == 0) {
/* rehash list of printers */
short dummy; short dummy;
if (XpQueryVersion(dpy, &dummy, &dummy)) { if (XpQueryVersion(dpy, &dummy, &dummy)) {
XpRehashPrinterList(dpy); XpRehashPrinterList(dpy);
} else { } else {
fprintf(stderr, "server does not have extension for rehashprinterlist option\n"); fprintf(stderr,
"server does not have extension for rehashprinterlist option\n");
} }
} }
#endif #endif
@ -404,8 +404,7 @@ for (i = 1; i < argc; ) {
} }
set_font_path(dpy, arg, 1, 0, 0); /* special argument */ set_font_path(dpy, arg, 1, 0, 0); /* special argument */
i++; i++;
} } else if (strcmp(arg, "fp=") == 0) { /* unconditionally set */
else if (strcmp(arg, "fp=") == 0) { /* unconditionally set */
if (i >= argc) { if (i >= argc) {
usage("missing fp= argument", NULL); usage("missing fp= argument", NULL);
} else { } else {
@ -413,32 +412,31 @@ for (i = 1; i < argc; ) {
} }
set_font_path(dpy, arg, 0, 0, 0); /* not special, set */ set_font_path(dpy, arg, 0, 0, 0); /* not special, set */
i++; i++;
} } else if (strcmp(arg, "+fp") == 0) { /* set font path */
else if (strcmp(arg, "+fp") == 0) { /* set font path */ if (i >= argc)
if (i >= argc) usage ("missing +fp argument", NULL); usage("missing +fp argument", NULL);
arg = nextarg(i, argv); arg = nextarg(i, argv);
set_font_path(dpy, arg, 0, 1, 0); /* not special, prepend */ set_font_path(dpy, arg, 0, 1, 0); /* not special, prepend */
i++; i++;
} } else if (strcmp(arg, "fp+") == 0) { /* set font path */
else if (strcmp(arg, "fp+") == 0) { /* set font path */ if (i >= argc)
if (i >= argc) usage ("missing fp+ argument", NULL); usage("missing fp+ argument", NULL);
arg = nextarg(i, argv); arg = nextarg(i, argv);
set_font_path(dpy, arg, 0, 0, 1); /* not special, append */ set_font_path(dpy, arg, 0, 0, 1); /* not special, append */
i++; i++;
} } else if (strcmp(arg, "-fp") == 0) { /* set font path */
else if (strcmp(arg, "-fp") == 0) { /* set font path */ if (i >= argc)
if (i >= argc) usage ("missing -fp argument", NULL); usage("missing -fp argument", NULL);
arg = nextarg(i, argv); arg = nextarg(i, argv);
set_font_path(dpy, arg, 0, -1, 0); /* not special, preremove */ set_font_path(dpy, arg, 0, -1, 0); /* not special, preremove */
i++; i++;
} } else if (strcmp(arg, "fp-") == 0) { /* set font path */
else if (strcmp(arg, "fp-") == 0) { /* set font path */ if (i >= argc)
if (i >= argc) usage ("missing fp- argument", NULL); usage("missing fp- argument", NULL);
arg = nextarg(i, argv); arg = nextarg(i, argv);
set_font_path(dpy, arg, 0, 0, -1); /* not special, postremove */ set_font_path(dpy, arg, 0, 0, -1); /* not special, postremove */
i++; i++;
} } else if (strcmp(arg, "-led") == 0) { /* Turn off one or all LEDs */
else if (strcmp(arg, "-led") == 0) { /* Turn off one or all LEDs */
values.led_mode = OFF; values.led_mode = OFF;
values.led = ALL; /* None specified */ values.led = ALL; /* None specified */
if (i >= argc) { if (i >= argc) {
@ -451,23 +449,21 @@ for (i = 1; i < argc; ) {
i++; i++;
} }
set_led(dpy, values.led, values.led_mode); set_led(dpy, values.led, values.led_mode);
} } else if (strcmp(arg, "led") == 0) { /* Turn on one or all LEDs */
else if (strcmp(arg, "led") == 0) { /* Turn on one or all LEDs */
values.led_mode = ON; values.led_mode = ON;
values.led = ALL; values.led = ALL;
if (i >= argc) { if (i >= argc) {
set_led (dpy, values.led, values.led_mode); /* set led to def */ set_led(dpy, values.led,
values.led_mode); /* set led to def */
break; break;
} }
arg = nextarg(i, argv); arg = nextarg(i, argv);
if (strcmp(arg, "on") == 0) { if (strcmp(arg, "on") == 0) {
i++; i++;
} } else if (strcmp(arg, "off") == 0) { /* ...except in this case. */
else if (strcmp(arg, "off") == 0) { /* ...except in this case. */
values.led_mode = OFF; values.led_mode = OFF;
i++; i++;
} } else if (is_number(arg, 32) && atoi(arg) > 0) {
else if (is_number(arg, 32) && atoi(arg) > 0) {
values.led = atoi(arg); values.led = atoi(arg);
i++; i++;
} }
@ -485,8 +481,7 @@ for (i = 1; i < argc; ) {
arg = argv[i]; arg = argv[i];
if (strcmp(arg, "default") == 0) { if (strcmp(arg, "default") == 0) {
i++; i++;
} } else if (*arg >= '0' && *arg <= '9') {
else if (*arg >= '0' && *arg <= '9') {
acc_denom = 1; acc_denom = 1;
sscanf(arg, "%d/%d", &acc_num, &acc_denom); sscanf(arg, "%d/%d", &acc_num, &acc_denom);
i++; i++;
@ -505,23 +500,25 @@ for (i = 1; i < argc; ) {
#ifdef DPMSExtension #ifdef DPMSExtension
else if (strcmp(arg, "+dpms") == 0) { /* turn on DPMS */ else if (strcmp(arg, "+dpms") == 0) { /* turn on DPMS */
int dummy; int dummy;
if (DPMSQueryExtension(dpy, &dummy, &dummy)) if (DPMSQueryExtension(dpy, &dummy, &dummy))
DPMSEnable(dpy); DPMSEnable(dpy);
else else
fprintf(stderr, "server does not have extension for +dpms option\n"); fprintf(stderr,
} "server does not have extension for +dpms option\n");
else if (strcmp(arg, "-dpms") == 0) { /* shut off DPMS */ } else if (strcmp(arg, "-dpms") == 0) { /* shut off DPMS */
int dummy; int dummy;
if (DPMSQueryExtension(dpy, &dummy, &dummy)) if (DPMSQueryExtension(dpy, &dummy, &dummy))
DPMSDisable(dpy); DPMSDisable(dpy);
else else
fprintf(stderr, "server does not have extension for -dpms option\n"); fprintf(stderr,
"server does not have extension for -dpms option\n");
} } else if (strcmp(arg, "dpms") == 0) { /* tune DPMS */
else if (strcmp(arg, "dpms") == 0) { /* tune DPMS */
int dummy; int dummy;
if (DPMSQueryExtension(dpy, &dummy, &dummy))
{ if (DPMSQueryExtension(dpy, &dummy, &dummy)) {
DPMSGetTimeouts(dpy, &standby_timeout, &suspend_timeout, DPMSGetTimeouts(dpy, &standby_timeout, &suspend_timeout,
&off_timeout); &off_timeout);
if (i >= argc) { if (i >= argc) {
@ -543,40 +540,46 @@ for (i = 1; i < argc; ) {
arg = argv[i]; arg = argv[i];
} }
} }
if ((suspend_timeout != 0)&&(standby_timeout > suspend_timeout)) if ((suspend_timeout != 0)
{ && (standby_timeout > suspend_timeout)) {
fprintf(stderr, "illegal combination of values\n"); fprintf(stderr, "illegal combination of values\n");
fprintf(stderr, " standby time of %d is greater than suspend time of %d\n", standby_timeout, suspend_timeout); fprintf(stderr,
" standby time of %d is greater than suspend time of %d\n",
standby_timeout, suspend_timeout);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if ((off_timeout != 0)&&(suspend_timeout > off_timeout)) if ((off_timeout != 0) && (suspend_timeout > off_timeout)) {
{
fprintf(stderr, "illegal combination of values\n"); fprintf(stderr, "illegal combination of values\n");
fprintf(stderr, " suspend time of %d is greater than off time of %d\n", suspend_timeout, off_timeout); fprintf(stderr,
" suspend time of %d is greater than off time of %d\n",
suspend_timeout, off_timeout);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if ((suspend_timeout == 0) && (off_timeout != 0) && if ((suspend_timeout == 0) && (off_timeout != 0) &&
(standby_timeout > off_timeout)) (standby_timeout > off_timeout)) {
{
fprintf(stderr, "illegal combination of values\n"); fprintf(stderr, "illegal combination of values\n");
fprintf(stderr, " standby time of %d is greater than off time of %d\n", standby_timeout, off_timeout); fprintf(stderr,
" standby time of %d is greater than off time of %d\n",
standby_timeout, off_timeout);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
DPMSEnable(dpy); DPMSEnable(dpy);
DPMSSetTimeouts(dpy, standby_timeout, suspend_timeout, off_timeout); DPMSSetTimeouts(dpy, standby_timeout, suspend_timeout,
} off_timeout);
else if (i+1 < argc && strcmp(arg, "force") == 0) { } else if (i + 1 < argc && strcmp(arg, "force") == 0) {
i++; i++;
arg = argv[i]; arg = argv[i];
/* /*
* The calls to usleep below are necessary to delay the actual * The calls to usleep below are necessary to
* DPMS mode setting briefly. Without them, it's likely that the * delay the actual DPMS mode setting briefly.
* mode will be set between the Down and Up key transitions, in * Without them, it's likely that the mode will be
* which case the Up transition may immediately turn the display * set between the Down and Up key transitions, in
* back on. * which case the Up transition may immediately
* turn the display back on.
* *
* On OS/2, use _sleep2() * On OS/2, use _sleep2()
*/ */
#ifdef HAVE_USLEEP #ifdef HAVE_USLEEP
# define Usleep(us) usleep((us)) # define Usleep(us) usleep((us))
#else #else
@ -621,33 +624,29 @@ for (i = 1; i < argc; ) {
DPMSEnable(dpy); DPMSEnable(dpy);
DPMSForceLevel(dpy, DPMSModeOn); DPMSForceLevel(dpy, DPMSModeOn);
i++; i++;
} } else if (strcmp(arg, "standby") == 0) {
else if (strcmp(arg, "standby") == 0) {
DPMSEnable(dpy); DPMSEnable(dpy);
Usleep(100000); Usleep(100000);
DPMSForceLevel(dpy, DPMSModeStandby); DPMSForceLevel(dpy, DPMSModeStandby);
i++; i++;
} } else if (strcmp(arg, "suspend") == 0) {
else if (strcmp(arg, "suspend") == 0) {
DPMSEnable(dpy); DPMSEnable(dpy);
Usleep(100000); Usleep(100000);
DPMSForceLevel(dpy, DPMSModeSuspend); DPMSForceLevel(dpy, DPMSModeSuspend);
i++; i++;
} } else if (strcmp(arg, "off") == 0) {
else if (strcmp(arg, "off") == 0) {
DPMSEnable(dpy); DPMSEnable(dpy);
Usleep(100000); Usleep(100000);
DPMSForceLevel(dpy, DPMSModeOff); DPMSForceLevel(dpy, DPMSModeOff);
i++; i++;
} } else {
else {
fprintf(stderr, "bad parameter %s\n", arg); fprintf(stderr, "bad parameter %s\n", arg);
i++; i++;
} }
} }
} } else {
else { fprintf(stderr,
fprintf(stderr, "server does not have extension for dpms option\n"); "server does not have extension for dpms option\n");
} }
} }
#endif /* DPMSExtension */ #endif /* DPMSExtension */
@ -660,20 +659,16 @@ for (i = 1; i < argc; ) {
if (strcmp(arg, "blank") == 0) { /* Alter blanking preference. */ if (strcmp(arg, "blank") == 0) { /* Alter blanking preference. */
set_saver(dpy, PREFER_BLANK, PreferBlanking); set_saver(dpy, PREFER_BLANK, PreferBlanking);
i++; i++;
} } else if (strcmp(arg, "noblank") == 0) { /* Ditto. */
else if (strcmp(arg, "noblank") == 0) { /* Ditto. */
set_saver(dpy, PREFER_BLANK, DontPreferBlanking); set_saver(dpy, PREFER_BLANK, DontPreferBlanking);
i++; i++;
} } else if (strcmp(arg, "expose") == 0) { /* Alter exposure preference. */
else if (strcmp(arg, "expose") == 0) { /* Alter exposure preference. */
set_saver(dpy, ALLOW_EXP, AllowExposures); set_saver(dpy, ALLOW_EXP, AllowExposures);
i++; i++;
} } else if (strcmp(arg, "noexpose") == 0) { /* Ditto. */
else if (strcmp(arg, "noexpose") == 0) { /* Ditto. */
set_saver(dpy, ALLOW_EXP, DontAllowExposures); set_saver(dpy, ALLOW_EXP, DontAllowExposures);
i++; i++;
} } else if (strcmp(arg, "off") == 0) {
else if (strcmp(arg, "off") == 0) {
set_saver(dpy, TIMEOUT, 0); /* Turn off screen saver. */ set_saver(dpy, TIMEOUT, 0); /* Turn off screen saver. */
i++; i++;
if (i >= argc) if (i >= argc)
@ -683,24 +678,19 @@ for (i = 1; i < argc; ) {
set_saver(dpy, INTERVAL, 0); set_saver(dpy, INTERVAL, 0);
i++; i++;
} }
} } else if (strcmp(arg, "default") == 0) { /* Leave as default. */
else if (strcmp(arg, "default") == 0) { /* Leave as default. */
set_saver(dpy, ALL, SERVER_DEFAULT); set_saver(dpy, ALL, SERVER_DEFAULT);
i++; i++;
} } else if (strcmp(arg, "on") == 0) { /* Turn on. */
else if (strcmp(arg, "on") == 0) { /* Turn on. */
set_saver(dpy, ALL, DEFAULT_TIMEOUT); set_saver(dpy, ALL, DEFAULT_TIMEOUT);
i++; i++;
} } else if (strcmp(arg, "activate") == 0) { /* force it active */
else if (strcmp(arg, "activate") == 0) { /* force it active */
XActivateScreenSaver(dpy); XActivateScreenSaver(dpy);
i++; i++;
} } else if (strcmp(arg, "reset") == 0) { /* force it inactive */
else if (strcmp(arg, "reset") == 0) { /* force it inactive */
XResetScreenSaver(dpy); XResetScreenSaver(dpy);
i++; i++;
} } else if (*arg >= '0' && *arg <= '9') { /* Set as user wishes. */
else if (*arg >= '0' && *arg <= '9') { /* Set as user wishes. */
set_saver(dpy, TIMEOUT, atoi(arg)); set_saver(dpy, TIMEOUT, atoi(arg));
i++; i++;
if (i >= argc) if (i >= argc)
@ -711,8 +701,8 @@ for (i = 1; i < argc; ) {
i++; i++;
} }
} }
} } else if (strcmp(arg, "-r") == 0) { /* Turn off one or
else if (strcmp(arg, "-r") == 0) { /* Turn off one or all autorepeats */ all autorepeats */
auto_repeat_mode = OFF; auto_repeat_mode = OFF;
key = ALL; /* None specified */ key = ALL; /* None specified */
arg = argv[i]; arg = argv[i];
@ -722,24 +712,26 @@ for (i = 1; i < argc; ) {
i++; i++;
} }
set_repeat(dpy, key, auto_repeat_mode); set_repeat(dpy, key, auto_repeat_mode);
} } else if (strcmp(arg, "r") == 0) { /* Turn on one or
else if (strcmp(arg, "r") == 0) { /* Turn on one or all autorepeats */ all autorepeats */
auto_repeat_mode = ON; auto_repeat_mode = ON;
key = ALL; /* None specified */ key = ALL; /* None specified */
arg = argv[i]; arg = argv[i];
if (i < argc) { if (i < argc) {
if (strcmp(arg, "on") == 0) { if (strcmp(arg, "on") == 0) {
i++; i++;
} } else if (strcmp(arg, "off") == 0) { /* ...except in
else if (strcmp(arg, "off") == 0) { /* ...except in this case */ this case */
auto_repeat_mode = OFF; auto_repeat_mode = OFF;
i++; i++;
} }
#if defined(XF86MISC) || defined(XKB) #if defined(XF86MISC) || defined(XKB)
else if (strcmp(arg, "rate") == 0) { /* ...or this one. */ else if (strcmp(arg, "rate") == 0) { /* ...or this one. */
int delay = 0, rate = 0; int delay = 0, rate = 0;
#ifdef XF86MISC #ifdef XF86MISC
int rate_set = 0; int rate_set = 0;
if (XF86MiscQueryVersion(dpy, &major, &minor)) { if (XF86MiscQueryVersion(dpy, &major, &minor)) {
delay = KBDDELAY_DEFAULT, rate = KBDRATE_DEFAULT; delay = KBDDELAY_DEFAULT, rate = KBDRATE_DEFAULT;
} else { } else {
@ -747,8 +739,8 @@ for (i = 1; i < argc; ) {
} }
#endif #endif
#ifdef XKB #ifdef XKB
if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, &xkberror, &xkbmajor, if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent,
&xkbminor)) { &xkberror, &xkbmajor, &xkbminor)) {
delay = XKBDDELAY_DEFAULT, rate = XKBDRATE_DEFAULT; delay = XKBDDELAY_DEFAULT, rate = XKBDRATE_DEFAULT;
} else { } else {
xkbpresent = 0; xkbpresent = 0;
@ -793,8 +785,7 @@ for (i = 1; i < argc; ) {
} }
} }
set_repeat(dpy, key, auto_repeat_mode); set_repeat(dpy, key, auto_repeat_mode);
} } else if (strcmp(arg, "p") == 0) {
else if (strcmp(arg, "p") == 0) {
if (i + 1 >= argc) if (i + 1 >= argc)
usage("missing argument to p", NULL); usage("missing argument to p", NULL);
arg = argv[i]; arg = argv[i];
@ -808,17 +799,13 @@ for (i = 1; i < argc; ) {
colors[numpixels] = argv[i]; colors[numpixels] = argv[i];
i++; i++;
numpixels++; numpixels++;
} } else if (strcmp(arg, "-k") == 0) {
else if (strcmp(arg, "-k") == 0) {
set_lock(dpy, OFF); set_lock(dpy, OFF);
} } else if (strcmp(arg, "k") == 0) {
else if (strcmp(arg, "k") == 0) {
set_lock(dpy, ON); set_lock(dpy, ON);
} } else if (strcmp(arg, "q") == 0 || strcmp(arg, "-q") == 0) {
else if (strcmp(arg, "q") == 0 || strcmp(arg, "-q") == 0) {
query(dpy); query(dpy);
} } else
else
usage("unknown option %s", arg); usage("unknown option %s", arg);
} }
@ -850,6 +837,7 @@ set_click(Display *dpy, int percent)
{ {
XKeyboardControl values; XKeyboardControl values;
XKeyboardState kbstate; XKeyboardState kbstate;
values.key_click_percent = percent; values.key_click_percent = percent;
if (percent == DEFAULT_ON) if (percent == DEFAULT_ON)
values.key_click_percent = SERVER_DEFAULT; values.key_click_percent = SERVER_DEFAULT;
@ -869,6 +857,7 @@ set_bell_vol(Display *dpy, int percent)
{ {
XKeyboardControl values; XKeyboardControl values;
XKeyboardState kbstate; XKeyboardState kbstate;
values.bell_percent = percent; values.bell_percent = percent;
if (percent == DEFAULT_ON) if (percent == DEFAULT_ON)
values.bell_percent = SERVER_DEFAULT; values.bell_percent = SERVER_DEFAULT;
@ -887,6 +876,7 @@ static void
set_bell_pitch(Display *dpy, int pitch) set_bell_pitch(Display *dpy, int pitch)
{ {
XKeyboardControl values; XKeyboardControl values;
values.bell_pitch = pitch; values.bell_pitch = pitch;
XChangeKeyboardControl(dpy, KBBellPitch, &values); XChangeKeyboardControl(dpy, KBBellPitch, &values);
return; return;
@ -896,6 +886,7 @@ static void
set_bell_dur(Display *dpy, int duration) set_bell_dur(Display *dpy, int duration)
{ {
XKeyboardControl values; XKeyboardControl values;
values.bell_duration = duration; values.bell_duration = duration;
XChangeKeyboardControl(dpy, KBBellDuration, &values); XChangeKeyboardControl(dpy, KBBellDuration, &values);
return; return;
@ -915,8 +906,10 @@ return;
static void static void
set_font_path(Display *dpy, char *path, int special, int before, int after) set_font_path(Display *dpy, char *path, int special, int before, int after)
{ {
char **directoryList = NULL; int ndirs = 0; char **directoryList = NULL;
char **currentList = NULL; int ncurrent = 0; int ndirs = 0;
char **currentList = NULL;
int ncurrent = 0;
if (special) { if (special) {
if (strcmp(path, "default") == 0) { if (strcmp(path, "default") == 0) {
@ -948,8 +941,7 @@ set_font_path(Display *dpy, char *path, int special, int before, int after)
if (before != 0 || after != 0) { if (before != 0 || after != 0) {
currentList = XGetFontPath(dpy, &ncurrent); currentList = XGetFontPath(dpy, &ncurrent);
if (!currentList) { if (!currentList) {
fprintf (stderr, "%s: unable to get old font path.\n", fprintf(stderr, "%s: unable to get old font path.\n", progName);
progName);
before = after = 0; before = after = 0;
} }
} }
@ -966,7 +958,8 @@ set_font_path(Display *dpy, char *path, int special, int before, int after)
} }
directoryList = (char **)malloc(ndirs * sizeof(char *)); directoryList = (char **)malloc(ndirs * sizeof(char *));
if (!directoryList) error ("out of memory for font path directory list"); if (!directoryList)
error("out of memory for font path directory list");
{ {
/* mung the path and set directoryList pointers */ /* mung the path and set directoryList pointers */
@ -999,7 +992,8 @@ set_font_path(Display *dpy, char *path, int special, int before, int after)
int nnew = ndirs + ncurrent; int nnew = ndirs + ncurrent;
char **newList = (char **)malloc(nnew * sizeof(char *)); char **newList = (char **)malloc(nnew * sizeof(char *));
if (!newList) error ("out of memory"); if (!newList)
error("out of memory");
if (before > 0) { /* new + current */ if (before > 0) { /* new + current */
memmove((char *)newList, (char *)directoryList, memmove((char *)newList, (char *)directoryList,
(unsigned)(ndirs * sizeof(char *))); (unsigned)(ndirs * sizeof(char *)));
@ -1022,14 +1016,16 @@ set_font_path(Display *dpy, char *path, int special, int before, int after)
int nnew = 0; int nnew = 0;
char **newList = (char **)malloc(ncurrent * sizeof(char *)); char **newList = (char **)malloc(ncurrent * sizeof(char *));
if (!newList) error ("out of memory"); if (!newList)
error("out of memory");
for (i = 0; i < ncurrent; i++) { for (i = 0; i < ncurrent; i++) {
for (j = 0; j < ndirs; j++) { for (j = 0; j < ndirs; j++) {
if (strcmp(currentList[i], directoryList[j]) == 0) if (strcmp(currentList[i], directoryList[j]) == 0)
break; break;
} }
/* if we ran out, then insert into new list */ /* if we ran out, then insert into new list */
if (j == ndirs) newList[nnew++] = currentList[i]; if (j == ndirs)
newList[nnew++] = currentList[i];
} }
if (nnew == ncurrent) { if (nnew == ncurrent) {
fprintf(stderr, fprintf(stderr,
@ -1040,8 +1036,10 @@ set_font_path(Display *dpy, char *path, int special, int before, int after)
free((char *)newList); free((char *)newList);
} }
if (directoryList) free ((char *) directoryList); if (directoryList)
if (currentList) XFreeFontPath (currentList); free((char *)directoryList);
if (currentList)
XFreeFontPath(currentList);
return; return;
} }
@ -1050,12 +1048,12 @@ static void
set_led(Display *dpy, int led, int led_mode) set_led(Display *dpy, int led, int led_mode)
{ {
XKeyboardControl values; XKeyboardControl values;
values.led_mode = led_mode; values.led_mode = led_mode;
if (led != ALL) { if (led != ALL) {
values.led = led; values.led = led;
XChangeKeyboardControl(dpy, KBLed | KBLedMode, &values); XChangeKeyboardControl(dpy, KBLed | KBLedMode, &values);
} } else {
else {
XChangeKeyboardControl(dpy, KBLedMode, &values); XChangeKeyboardControl(dpy, KBLedMode, &values);
} }
return; return;
@ -1074,7 +1072,8 @@ if (acc_num < 0) /* shouldn't happen */
acc_num = SERVER_DEFAULT; acc_num = SERVER_DEFAULT;
if (acc_denom <= 0) /* prevent divide by zero */ if (acc_denom <= 0) /* prevent divide by zero */
acc_denom = SERVER_DEFAULT; acc_denom = SERVER_DEFAULT;
if (threshold < 0) threshold = SERVER_DEFAULT; if (threshold < 0)
threshold = SERVER_DEFAULT;
XChangePointerControl(dpy, do_accel, do_threshold, acc_num, XChangePointerControl(dpy, do_accel, do_threshold, acc_num,
acc_denom, threshold); acc_denom, threshold);
return; return;
@ -1084,20 +1083,23 @@ static void
set_saver(Display *dpy, int mask, int value) set_saver(Display *dpy, int mask, int value)
{ {
int timeout, interval, prefer_blank, allow_exp; int timeout, interval, prefer_blank, allow_exp;
XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank,
&allow_exp); XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
if (mask == TIMEOUT) timeout = value; if (mask == TIMEOUT)
if (mask == INTERVAL) interval = value; timeout = value;
if (mask == PREFER_BLANK) prefer_blank = value; if (mask == INTERVAL)
if (mask == ALLOW_EXP) allow_exp = value; interval = value;
if (mask == PREFER_BLANK)
prefer_blank = value;
if (mask == ALLOW_EXP)
allow_exp = value;
if (mask == ALL) { if (mask == ALL) {
timeout = SERVER_DEFAULT; timeout = SERVER_DEFAULT;
interval = SERVER_DEFAULT; interval = SERVER_DEFAULT;
prefer_blank = DefaultBlanking; prefer_blank = DefaultBlanking;
allow_exp = DefaultExposures; allow_exp = DefaultExposures;
} }
XSetScreenSaver(dpy, timeout, interval, prefer_blank, XSetScreenSaver(dpy, timeout, interval, prefer_blank, allow_exp);
allow_exp);
if (mask == ALL && value == DEFAULT_TIMEOUT) { if (mask == ALL && value == DEFAULT_TIMEOUT) {
XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp); XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
if (!timeout) if (!timeout)
@ -1111,12 +1113,12 @@ static void
set_repeat(Display *dpy, int key, int auto_repeat_mode) set_repeat(Display *dpy, int key, int auto_repeat_mode)
{ {
XKeyboardControl values; XKeyboardControl values;
values.auto_repeat_mode = auto_repeat_mode; values.auto_repeat_mode = auto_repeat_mode;
if (key != ALL) { if (key != ALL) {
values.key = key; values.key = key;
XChangeKeyboardControl(dpy, KBKey | KBAutoRepeatMode, &values); XChangeKeyboardControl(dpy, KBKey | KBAutoRepeatMode, &values);
} } else {
else {
XChangeKeyboardControl(dpy, KBAutoRepeatMode, &values); XChangeKeyboardControl(dpy, KBAutoRepeatMode, &values);
} }
return; return;
@ -1141,6 +1143,7 @@ static void
xkbset_repeatrate(Display *dpy, int delay, int interval) xkbset_repeatrate(Display *dpy, int delay, int interval)
{ {
XkbDescPtr xkb = XkbAllocKeyboard(); XkbDescPtr xkb = XkbAllocKeyboard();
if (!xkb) if (!xkb)
return; return;
XkbGetControls(dpy, XkbRepeatKeysMask, xkb); XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
@ -1152,7 +1155,8 @@ xkbset_repeatrate(Display *dpy, int delay, int interval)
#endif #endif
static void static void
set_pixels(Display *dpy, unsigned long *pixels, caddr_t *colors, int numpixels) set_pixels(Display *dpy, unsigned long *pixels, caddr_t * colors,
int numpixels)
{ {
XColor def; XColor def;
int scr = DefaultScreen(dpy); int scr = DefaultScreen(dpy);
@ -1195,7 +1199,8 @@ set_pixels(Display *dpy, unsigned long *pixels, caddr_t *colors, int numpixels)
} }
if (visual_type) { if (visual_type) {
fprintf (stderr, "%s: cannot set pixel values in read-only %s visuals\n", fprintf(stderr,
"%s: cannot set pixel values in read-only %s visuals\n",
progName, visual_type); progName, visual_type);
} else { } else {
for (i = 0; i < numpixels; i++) { for (i = 0; i < numpixels; i++) {
@ -1208,7 +1213,8 @@ set_pixels(Display *dpy, unsigned long *pixels, caddr_t *colors, int numpixels)
if (XParseColor(dpy, cmap, colors[i], &def)) if (XParseColor(dpy, cmap, colors[i], &def))
XStoreColor(dpy, cmap, &def); XStoreColor(dpy, cmap, &def);
else else
fprintf (stderr, "%s: invalid color \"%s\"\n", progName, colors[i]); fprintf(stderr, "%s: invalid color \"%s\"\n", progName,
colors[i]);
} }
} }
} }
@ -1222,12 +1228,17 @@ static void
set_lock(Display *dpy, Bool onoff) set_lock(Display *dpy, Bool onoff)
{ {
XModifierKeymap *mods; XModifierKeymap *mods;
mods = XGetModifierMapping(dpy); mods = XGetModifierMapping(dpy);
if (onoff) if (onoff)
mods = XInsertModifiermapEntry(mods, (KeyCode) XK_Caps_Lock, LockMapIndex); mods =
XInsertModifiermapEntry(mods, (KeyCode) XK_Caps_Lock,
LockMapIndex);
else else
mods = XDeleteModifiermapEntry(mods, (KeyCode) XK_Caps_Lock, LockMapIndex); mods =
XDeleteModifiermapEntry(mods, (KeyCode) XK_Caps_Lock,
LockMapIndex);
XSetModifierMapping(dpy, mods); XSetModifierMapping(dpy, mods);
XFreeModifiermap(mods); XFreeModifiermap(mods);
return; return;
@ -1235,11 +1246,7 @@ set_lock(Display *dpy, Bool onoff)
#ifdef FONTCACHE #ifdef FONTCACHE
static Status static Status
set_font_cache(dpy, himark, lowmark, balance) set_font_cache(Display *dpy, long himark, long lowmark, long balance)
Display *dpy;
long himark;
long lowmark;
long balance;
{ {
FontCacheSettings cs; FontCacheSettings cs;
Status status; Status status;
@ -1267,7 +1274,6 @@ on_or_off(int val, int onval, char *onstr,
return buf; return buf;
} }
/* This is the information-getting function for telling the user what the /* This is the information-getting function for telling the user what the
* current "xsettings" are. * current "xsettings" are.
*/ */
@ -1279,6 +1285,7 @@ XKeyboardState values;
int acc_num, acc_denom, threshold; int acc_num, acc_denom, threshold;
int timeout, interval, prefer_blank, allow_exp; int timeout, interval, prefer_blank, allow_exp;
int dummy; int dummy;
#ifdef XF86MISC #ifdef XF86MISC
XF86MiscKbdSettings kbdinfo; XF86MiscKbdSettings kbdinfo;
#endif #endif
@ -1287,7 +1294,8 @@ XkbDescPtr xkb;
int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion; int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
int xkbopcode, xkbevent, xkberror; int xkbopcode, xkbevent, xkberror;
#endif #endif
char **font_path; int npaths; char **font_path;
int npaths;
int i, j; int i, j;
char buf[20]; /* big enough for 16 bit number */ char buf[20]; /* big enough for 16 bit number */
@ -1297,12 +1305,14 @@ XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
font_path = XGetFontPath(dpy, &npaths); font_path = XGetFontPath(dpy, &npaths);
printf("Keyboard Control:\n"); printf("Keyboard Control:\n");
printf (" auto repeat: %s key click percent: %d LED mask: %08lx\n", printf
on_or_off (values.global_auto_repeat, (" auto repeat: %s key click percent: %d LED mask: %08lx\n",
AutoRepeatModeOn, "on", AutoRepeatModeOff, "off", buf), on_or_off(values.global_auto_repeat, AutoRepeatModeOn, "on",
values.key_click_percent, values.led_mask); AutoRepeatModeOff, "off", buf), values.key_click_percent,
values.led_mask);
#ifdef XKB #ifdef XKB
if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, &xkberror, &xkbmajor, &xkbminor) if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, &xkberror, &xkbmajor,
&xkbminor)
&& (xkb = XkbAllocKeyboard()) != NULL && (xkb = XkbAllocKeyboard()) != NULL
&& XkbGetControls(dpy, XkbRepeatKeysMask, xkb) == Success) && XkbGetControls(dpy, XkbRepeatKeysMask, xkb) == Success)
printf(" auto repeat delay: %d repeat rate: %d\n", printf(" auto repeat delay: %d repeat rate: %d\n",
@ -1319,7 +1329,8 @@ if (XF86MiscQueryExtension(dpy, &dummy, &dummy) &&
#endif #endif
printf(" auto repeating keys: "); printf(" auto repeating keys: ");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (i) printf (" "); if (i)
printf(" ");
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
printf("%02x", (unsigned char)values.auto_repeats[i * 8 + j]); printf("%02x", (unsigned char)values.auto_repeats[i * 8 + j]);
} }
@ -1343,8 +1354,8 @@ printf (" timeout: %d cycle: %d\n", timeout, interval);
printf("Colors:\n"); printf("Colors:\n");
printf(" default colormap: 0x%lx BlackPixel: %ld WhitePixel: %ld\n", printf(" default colormap: 0x%lx BlackPixel: %ld WhitePixel: %ld\n",
DefaultColormap (dpy, scr), DefaultColormap(dpy, scr), BlackPixel(dpy, scr), WhitePixel(dpy,
BlackPixel (dpy, scr), WhitePixel (dpy, scr)); scr));
printf("Font Path:\n"); printf("Font Path:\n");
if (npaths) { if (npaths) {
@ -1359,6 +1370,7 @@ if (npaths) {
#ifdef MITMISC #ifdef MITMISC
{ {
int dummy; int dummy;
if (XMITMiscQueryExtension(dpy, &dummy, &dummy)) { if (XMITMiscQueryExtension(dpy, &dummy, &dummy)) {
if (XMITMiscGetBugMode(dpy)) if (XMITMiscGetBugMode(dpy))
printf("Bug Mode: compatibility mode is enabled\n"); printf("Bug Mode: compatibility mode is enabled\n");
@ -1400,14 +1412,11 @@ if (npaths) {
default: default:
printf(" Unrecognized response from server\n"); printf(" Unrecognized response from server\n");
} }
} } else
else
printf(" DPMS is Disabled\n"); printf(" DPMS is Disabled\n");
} } else
else
printf(" Display is not capable of DPMS\n"); printf(" Display is not capable of DPMS\n");
} } else {
else {
printf(" Server does not have the DPMS Extension\n"); printf(" Server does not have the DPMS Extension\n");
} }
} }
@ -1461,8 +1470,7 @@ return;
* current settings and statistics are. * current settings and statistics are.
*/ */
static void static void
query_cache_status(dpy) query_cache_status(Display *dpy)
Display *dpy;
{ {
int dummy; int dummy;
FontCacheSettings cs; FontCacheSettings cs;
@ -1553,7 +1561,8 @@ usage(char *fmt, ...)
#endif #endif
#ifdef BUILD_PRINTSUPPORT #ifdef BUILD_PRINTSUPPORT
fprintf(stderr, " To control Xprint features:\n"); fprintf(stderr, " To control Xprint features:\n");
fprintf (stderr, "\t rehashprinterlist Recomputes the list of available printers\n"); fprintf(stderr,
"\t rehashprinterlist Recomputes the list of available printers\n");
#endif #endif
fprintf(stderr, " To set the font path:\n"); fprintf(stderr, " To set the font path:\n");
fprintf(stderr, "\t fp= path[,path...]\n"); fprintf(stderr, "\t fp= path[,path...]\n");
@ -1594,7 +1603,6 @@ error(char *message)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static int static int
local_xerror(Display *dpy, XErrorEvent *rep) local_xerror(Display *dpy, XErrorEvent *rep)
{ {
@ -1602,7 +1610,8 @@ local_xerror(Display *dpy, XErrorEvent *rep)
fprintf(stderr, fprintf(stderr,
"%s: bad font path element (#%ld), possible causes are:\n", "%s: bad font path element (#%ld), possible causes are:\n",
progName, rep->resourceid); progName, rep->resourceid);
fprintf(stderr," Directory does not exist or has wrong permissions\n"); fprintf(stderr,
" Directory does not exist or has wrong permissions\n");
fprintf(stderr, " Directory missing fonts.dir\n"); fprintf(stderr, " Directory missing fonts.dir\n");
fprintf(stderr, " Incorrect font server address or syntax\n"); fprintf(stderr, " Incorrect font server address or syntax\n");
} else if (rep->request_code == X_StoreColors) { } else if (rep->request_code == X_StoreColors) {

7
xset/xset.man
View File

@ -199,6 +199,13 @@ option can be omitted, but if only one is
given, it will be interpreted as the acceleration. given, it will be interpreted as the acceleration.
If no parameters or the flag 'default' is used, the system defaults will If no parameters or the flag 'default' is used, the system defaults will
be set. be set.
If the `threshold' parameter is provided and 0, the `acceleration'
parameter will be used in the exponent of a more natural and continous
formula, giving precise control for slow motion but big reach for fast
motion, and a progresive transition for motions in between.
Recommended `acceleration' value in this case is 3/2 to 2, but not
limited to that range.
.PP .PP
.TP 8 .TP 8
.B p .B p