debian/changelog | 15 ++- debian/patches/01_sessreg_implement_hostname_hashing.diff | 8 - debian/patches/02_xmodmap-include-config.h-before-system-headers.diff | 45 ++++------ debian/rules | 1 4 files changed, 37 insertions(+), 32 deletions(-)
New commits: commit 2757d30a2a64f303cb5556f5ecde375b31e249f7 Author: Julien Cristau <[email protected]> Date: Sun Sep 15 21:37:14 2013 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 329a9c5..adf0185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-xserver-utils (7.7+1) UNRELEASED; urgency=low +x11-xserver-utils (7.7+1) unstable; urgency=low [ Robert Hooker ] * New upstream releases: @@ -29,7 +29,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low * Update/refresh patches. * Disable silent build rules. - -- Robert Hooker <[email protected]> Wed, 15 May 2013 12:08:34 -0400 + -- Julien Cristau <[email protected]> Sun, 15 Sep 2013 20:00:22 +0200 x11-xserver-utils (7.7~3) unstable; urgency=low commit bc0e2b1555c5ec92fbe69d5128123d738e76574b Author: Julien Cristau <[email protected]> Date: Sun Sep 15 20:00:20 2013 +0200 Disable silent build rules. diff --git a/debian/changelog b/debian/changelog index 8614226..329a9c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low - Ensure we don't read out of ClassName array bounds for unknown visual type (closes: #488535) * Update/refresh patches. + * Disable silent build rules. -- Robert Hooker <[email protected]> Wed, 15 May 2013 12:08:34 -0400 diff --git a/debian/rules b/debian/rules index 5d657a7..ae8c1bf 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch cd $*-build && \ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ + --disable-silent-rules \ CFLAGS="$(CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS="$(LDFLAGS)" commit 985dc739afc0ec528a9d843c0e216c488cb1461c Author: Julien Cristau <[email protected]> Date: Sun Sep 15 19:58:39 2013 +0200 Update/refresh patches. diff --git a/debian/changelog b/debian/changelog index 36a0c0f..8614226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low - Clarify .Xresources vs. .Xdefaults in man page (closes: #649187) - Ensure we don't read out of ClassName array bounds for unknown visual type (closes: #488535) + * Update/refresh patches. -- Robert Hooker <[email protected]> Wed, 15 May 2013 12:08:34 -0400 diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff b/debian/patches/01_sessreg_implement_hostname_hashing.diff index c2cd84f..d1ed5f7 100644 --- a/debian/patches/01_sessreg_implement_hostname_hashing.diff +++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff @@ -39,12 +39,12 @@ Index: x11-xserver-utils/sessreg/sessreg.c + static int wflag, uflag, lflag; static const char *wtmp_file, *utmp_file; - static char *line; -@@ -397,21 +409,23 @@ set_utmp (struct utmp *u, char *line, ch + #ifdef USE_UTMPX +@@ -399,21 +411,23 @@ set_utmp (struct utmp *u, char *line, ch memset (u->ut_name, 0, sizeof (u->ut_name)); #ifdef HAVE_STRUCT_UTMP_UT_ID if (line) { -- int i; +- size_t i; /* - * this is a bit crufty, but - * follows the apparent conventions in @@ -76,7 +76,7 @@ Index: x11-xserver-utils/sessreg/sessreg.c memset (u->ut_id, 0, sizeof (u->ut_id)); #endif #ifdef HAVE_STRUCT_UTMP_UT_PID -@@ -660,3 +674,129 @@ findslot (char *line_name, char *host_na +@@ -662,3 +676,129 @@ findslot (char *line_name, char *host_na return freeslot; } #endif diff --git a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff index 583c99c..f793b48 100644 --- a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff +++ b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff @@ -13,13 +13,13 @@ Reviewed-by: Peter Hutterer <[email protected]> xmodmap.c | 4 ++++ 3 files changed, 12 insertions(+) -diff --git a/xmodmap/exec.c b/xmodmap/exec.c -index dbcb669..419b10e 100644 ---- a/xmodmap/exec.c -+++ b/xmodmap/exec.c -@@ -54,6 +54,10 @@ from The Open Group. - * original xmodmap, written by David Rosenthal, of Sun Microsystems. - */ +Index: x11-xserver-utils/xmodmap/exec.c +=================================================================== +--- x11-xserver-utils.orig/xmodmap/exec.c ++++ x11-xserver-utils/xmodmap/exec.c +@@ -62,6 +62,10 @@ from The Open Group. + #include <X11/Xwindows.h> + #endif +#ifdef HAVE_CONFIG_H +# include "config.h" @@ -28,13 +28,13 @@ index dbcb669..419b10e 100644 #include <X11/Xos.h> #include <X11/Xlib.h> #include <stdio.h> -diff --git a/xmodmap/pf.c b/xmodmap/pf.c -index 0eb0f55..3f0c3f4 100644 ---- a/xmodmap/pf.c -+++ b/xmodmap/pf.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ +Index: x11-xserver-utils/xmodmap/pf.c +=================================================================== +--- x11-xserver-utils.orig/xmodmap/pf.c ++++ x11-xserver-utils/xmodmap/pf.c +@@ -30,6 +30,10 @@ from The Open Group. + # include "config.h" + #endif +#ifdef HAVE_CONFIG_H +# include "config.h" @@ -43,13 +43,13 @@ index 0eb0f55..3f0c3f4 100644 #include <X11/Xos.h> #include <X11/Xlib.h> #include <stdio.h> -diff --git a/xmodmap/xmodmap.c b/xmodmap/xmodmap.c -index 58a8e70..0f89629 100644 ---- a/xmodmap/xmodmap.c -+++ b/xmodmap/xmodmap.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ +Index: x11-xserver-utils/xmodmap/xmodmap.c +=================================================================== +--- x11-xserver-utils.orig/xmodmap/xmodmap.c ++++ x11-xserver-utils/xmodmap/xmodmap.c +@@ -30,6 +30,10 @@ from The Open Group. + # include "config.h" + #endif +#ifdef HAVE_CONFIG_H +# include "config.h" @@ -58,6 +58,3 @@ index 58a8e70..0f89629 100644 #include <X11/Xos.h> #include <X11/Xlib.h> #include <stdio.h> --- -1.7.10 - commit 4e51ba721f9286e9ee5a8df6627e3ea892d472fe Author: Julien Cristau <[email protected]> Date: Sun Sep 15 19:41:01 2013 +0200 Close a few bugs diff --git a/debian/changelog b/debian/changelog index b813d1a..36a0c0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,13 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low [ Julien Cristau ] * sessreg 1.0.8. - * xmodmap 1.0.8. - * xrdb 1.1.0. + * xmodmap 1.0.8 + - fixes error in manpage example about swapping Control_L/Caps_Lock keys + (closes: #641588) + * xrdb 1.1.0 + - Clarify .Xresources vs. .Xdefaults in man page (closes: #649187) + - Ensure we don't read out of ClassName array bounds for unknown visual + type (closes: #488535) -- Robert Hooker <[email protected]> Wed, 15 May 2013 12:08:34 -0400 commit da74da0d097b2ea2dc89a54444bd47f056778711 Author: Julien Cristau <[email protected]> Date: Sun Sep 15 19:19:56 2013 +0200 xrdb 1.1.0. diff --git a/debian/changelog b/debian/changelog index 435893b..b813d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low [ Julien Cristau ] * sessreg 1.0.8. * xmodmap 1.0.8. + * xrdb 1.1.0. -- Robert Hooker <[email protected]> Wed, 15 May 2013 12:08:34 -0400 diff --git a/xrdb/ChangeLog b/xrdb/ChangeLog index ce35754..4c55d1f 100644 --- a/xrdb/ChangeLog +++ b/xrdb/ChangeLog @@ -1,3 +1,190 @@ +commit 17eda976c8dca736ef63fc45ff7de8c73c0e2936 +Author: Alan Coopersmith <[email protected]> +Date: Sun Sep 8 10:16:42 2013 -0700 + + xrdb 1.1.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4e49a64191d3b08044d29d32896e15013e5e7540 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jul 19 19:51:09 2013 -0700 + + Add -version flag to print package version string from autoconf + + Also adds missing entry for -help flag to usage message. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-By: Matt Dew <[email protected]> + +commit ec7b273fd135a14a2ca6c19cd0e6afe1536db552 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jul 19 19:31:04 2013 -0700 + + Only add -P flag if using cpp as our preprocessor + + Restores ability to use m4 (broken in xrdb-1.0.8 by commit 117021570515f) + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=34546 + + Reviewed-by: <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 11e7f4610cd6468aeea115081dd72ddd7eba0f3f +Author: Matthieu Herrb <[email protected]> +Date: Fri Dec 3 15:52:04 2010 -0500 + + predefined cpp macros can produce unexpected results (bug 3413) + + GNU cpp is predefining a number of symbols, depending on the host and target + architecture. This can produce some unexpected results: for example, the + expansion of CLIENTHOST if the host name is i386.my.domain. + + The attached patch creates a new -undef option to xrdb that is passed to + cpp. + + Acked-by: Gaetan Nadon <[email protected]> + Signed-off-by: Matthieu Herrb <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d23e17e09c45e214737ddf8f653dc31cdcf3a0d2 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 6 18:53:49 2013 -0700 + + Rename args to several functions to not shadow global variables + + Renamed "buffer" to "b" and "dpy" to "display" to match common patterns + in other functions in xrdb.c + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4b8da0a0a296dce4ead1baac4a39ac27dee144da +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 6 18:44:47 2013 -0700 + + Mark fatal() & Syntax() with printf & noreturn attributes + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 45909ffe71788d80b2dabff886341b44c10a096d +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 6 18:42:28 2013 -0700 + + Strip trailing whitespace + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ce7d8d3eaab2a5392c24ba3cca79b6fd1610abcb +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 6 18:41:19 2013 -0700 + + Remove unnecessary casts from malloc & realloc calls + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 49022f26d97786b8252f9782d1517c6bf763e008 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 6 18:37:44 2013 -0700 + + Fix many const pointer warnings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 965ef4b3357a1dbf996529d98e812069878e07c4 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 6 12:02:23 2013 -0700 + + Ensure we don't read out of ClassName array bounds for unknown visual type + + Should never happen, but has been reported as happening at least once: + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488535 + + Instead prints warning messages to stderr to help diagnose where the + bad visual information is coming from. + + (Tested by temporarily commenting out names in the ClassName array.) + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ed086df97fc816dfeb792ac0094eaa8795177bf5 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jun 30 09:11:12 2013 -0700 + + Clarify .Xresources vs. .Xdefaults in man page + + Reported by John Feuerstein at + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649187 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 420347005ccf1886dfbb2eb2902beafdcf4e2477 +Author: Egbert Eich <[email protected]> +Date: Thu May 19 11:35:25 2011 +0200 + + Allow the CPP macro to contain preprocessors with command line options (v2) + + The preprocessor used for xrdb may require a command line option to + produce the desired output. For the GNU cpp this could be + 'traditional-cpp' which may not be valid for other preprocessors. + Therefore support the specification of preprocessors along with + required command line arguments when using the '--with-cpp' configure + option. + Example: + ./configure --with-cpp="/usr/bin/cpp --traditional-cpp, /usr/lib/cpp". + + v2: Followed a suggestion by Julien Cristau <[email protected]> + to allocate memory for the dup string dynamically instead of + using a static buffer. + + Signed-off-by: Egbert Eich <[email protected]> + +commit 76f2c5b2a744587a9e97b622ab359d6fd7689604 +Author: Egbert Eich <[email protected]> +Date: Thu May 19 11:29:57 2011 +0200 + + Usage: In usage message print preprocessor that's actually chosen. + + The CPP macro may contain a list of preprocessors to chose from. + In the usage message describing the -cpp command line option print + the preprocessor that would actually be chosen. + + Signed-off-by: Egbert Eich <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 58349f9efc204f5843cfeccc25fbc51f1f5029ae +Author: Jon TURNEY <[email protected]> +Date: Wed Jan 4 19:00:03 2012 +0000 + + Fix build with WIN32 defined, but PATHETICCPP not defined + + (Note that PATHETICCPP seems to be never defined now, see [1]) + + [1] http://lists.x.org/archives/xorg-devel/2010-October/013860.html + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Yaakov Selkowitz <[email protected]> + +commit 60577129058e018f13748b99e51ab1a17088db8e +Author: Alan Coopersmith <[email protected]> +Date: Thu Jun 16 15:38:17 2011 -0700 + + Tokenize #define names in the PATHETICCPP case too + + Fixes generation of the EXT_<extension-name> #defines, since cpp treats + a #define EXT_MIT-SHM as a token "EXT_MIT" with a value of "-SHM". + + Without this fix, an xrdb built with PATHETICCPP prints warnings of: + macro EXT_XC redefines previous macro at "", line 27 + macro EXT_XVideo redefines previous macro at "", line 33 + macro EXT_MIT redefines previous macro at "", line 35 + macro EXT_MIT redefines previous macro at "", line 37 + + due to extension #defines such as EXT_MIT-SCREEN-SAVER & EXT_MIT-SHM + conflicting with each other. + + Now matches the non-PATHETICCPP handling of #define names. + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 4b8990ea599aee08284481b258cccdc25dd5d8d8 Author: Matthias Hopf <[email protected]> Date: Tue Apr 5 17:50:00 2011 +0200 diff --git a/xrdb/INSTALL b/xrdb/INSTALL index e69de29..8b82ade 100644 --- a/xrdb/INSTALL +++ b/xrdb/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + 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 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. + + Running `configure' might take a while. 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. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +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=c99 CFLAGS=-g 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 can use 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 `..'. + + With a non-GNU `make', it is safer 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. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +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. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +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). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--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. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/xrdb/Makefile.am b/xrdb/Makefile.am index 251261b..16b6841 100644 --- a/xrdb/Makefile.am +++ b/xrdb/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/xrdb/Makefile.in b/xrdb/Makefile.in index 56e8237..dd740e1 100644 --- a/xrdb/Makefile.in +++ b/xrdb/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,9 +14,9 @@ @SET_MAKE@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -27,7 +26,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -37,6 +36,51 @@ # PERFORMANCE OF THIS SOFTWARE. VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,10 +101,11 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = xrdb$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ - config.guess config.sub depcomp install-sh missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in depcomp AUTHORS COPYING ChangeLog \ + INSTALL README compile config.guess config.sub install-sh \ + missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -77,50 +122,89 @@ am_xrdb_OBJECTS = xrdb.$(OBJEXT) xrdb_OBJECTS = $(am_xrdb_OBJECTS) am__DEPENDENCIES_1 = xrdb_DEPENDENCIES = $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xrdb_SOURCES) DIST_SOURCES = $(xrdb_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -148,7 +232,10 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -161,6 +248,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -210,11 +298,10 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ VERSION = @VERSION@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ @@ -282,7 +369,7 @@ all: config.h .SUFFIXES: -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
