x11-apps: Changes to 'debian-unstable'
bitmap/Bitmap.c | 30
bitmap/ChangeLog | 197 +
bitmap/Graphics.c | 8
bitmap/INSTALL | 121
bitmap/Makefile.in | 60
bitmap/aclocal.m4 | 315 +
bitmap/atobm.c | 93
bitmap/autogen.sh | 5
bitmap/bmtoa.c | 8
bitmap/compile | 2
bitmap/config.guess | 321 -
bitmap/config.h.in | 3
bitmap/config.sub | 51
bitmap/configure | 836 ++---
bitmap/configure.ac | 8
bitmap/depcomp | 5
bitmap/install-sh | 366 +-
bitmap/man/Makefile.in | 29
bitmap/man/bitmap.man | 21
bitmap/missing | 6
debian/changelog | 15
debian/compat | 2
debian/control | 4
debian/rules | 1
debian/upstream/signing-key.asc | 77
x11perf/ChangeLog | 130
x11perf/INSTALL | 121
x11perf/Makefile.in | 495 +-
x11perf/aclocal.m4 | 1510 ++++++---
x11perf/bitmaps.c | 19
x11perf/compile | 347 ++
x11perf/config.guess | 566 +--
x11perf/config.h.in | 3
x11perf/config.sub | 266 +
x11perf/configure | 6605 +++++++++++++++++++++++++++++++++++++---
x11perf/configure.ac | 7
x11perf/depcomp | 531 ++-
x11perf/do_arcs.c | 44
x11perf/do_blt.c | 131
x11perf/do_complex.c | 8
x11perf/do_dots.c | 4
x11perf/do_lines.c | 16
x11perf/do_movewin.c | 14
x11perf/do_rects.c | 6
x11perf/do_segs.c | 16
x11perf/do_simple.c | 10
x11perf/do_tests.c | 30
x11perf/do_text.c | 20
x11perf/do_traps.c | 12
x11perf/do_tris.c | 6
x11perf/do_valgc.c | 4
x11perf/do_windows.c | 20
x11perf/install-sh | 385 +-
x11perf/man/Makefile.in | 153
x11perf/missing | 461 --
x11perf/perfboth | 21
x11perf/perfratio | 19
x11perf/x11perf.c | 167 -
x11perf/x11perf.h | 236 -
xcalc/ChangeLog | 146
xcalc/INSTALL | 121
xcalc/Makefile.in | 434 +-
xcalc/aclocal.m4 | 815 ++--
xcalc/actions.c | 169 -
xcalc/compile | 347 ++
xcalc/config.guess | 363 --
xcalc/config.h.in | 3
xcalc/config.sub | 150
xcalc/configure | 1021 +++---
xcalc/configure.ac | 7
xcalc/depcomp | 487 +-
xcalc/install-sh | 374 +-
xcalc/man/Makefile.in | 129
xcalc/math.c | 149
xcalc/missing | 461 --
xcalc/xcalc.h | 17
xditview/ChangeLog | 107
xditview/Dvi.c | 25
xditview/Dvi.h | 5
xditview/DviChar.c | 11
xditview/DviChar.h | 19
xditview/DviP.h | 11
xditview/INSTALL | 121
xditview/Makefile.in | 442 +-
xditview/Menu.h | 4
xditview/XFontName.c | 72
xditview/XFontName.h | 2
xditview/aclocal.m4 | 815 ++--
xditview/compile | 347 ++
xditview/config.guess | 363 --
xditview/config.sub | 150
xditview/configure | 937 +++--
xditview/configure.ac | 12
xditview/depcomp | 487 +-
xditview/draw.c | 28
xditview/font.c | 43
xditview/install-sh | 374 +-
xditview/lex.c | 5
xditview/man/Makefile.in | 129
xditview/man/xditview.man | 3
xditview/missing | 461 --
xditview/page.c | 7
xditview/parse.c | 2
xditview/xdit.bm | 2
xditview/xdit_mask.bm | 2
xditview/xditview.c | 97
xedit/ChangeLog | 105
xedit/INSTALL | 121
xedit/Makefile.in | 1240 ++++---
xedit/aclocal.m4 | 5601 +++++++++++++++++----------------
xedit/ar-lib | 270 +
xedit/commands.c | 19
xedit/compile | 310 -
xedit/config.guess | 365 --
xedit/config.h.in | 10
xedit/config.sub | 152
xedit/configure | 1152 ++++--
xedit/configure.ac | 10
xedit/depcomp | 487 +-
xedit/hash.c | 7
xedit/hook.c | 35
xedit/install-sh | 14
xedit/ispell.c | 19
xedit/lisp/compile.c | 2
xedit/lisp/core.c | 3
xedit/lisp/debugger.c | 16
xedit/lisp/format.c | 43
xedit/lisp/internal.h | 50
xedit/lisp/io.c | 37
xedit/lisp/io.h | 16
xedit/lisp/lisp.c | 141
xedit/lisp/lisp.h | 2
xedit/lisp/mathimp.c | 4
xedit/lisp/package.c | 6
xedit/lisp/package.h | 4
xedit/lisp/pathname.c | 3
xedit/lisp/private.h | 19
xedit/lisp/re/re.c | 4
xedit/lisp/read.c | 81
xedit/lisp/stream.c | 2
xedit/lisp/write.c | 25
xedit/lisp/write.h | 2
xedit/lisp/xedit.c | 14
xedit/man/Makefile.in | 119
xedit/man/xedit.man | 12
xedit/missing | 461 --
xedit/util.c | 8
xedit/util.h | 2
xedit/xedit.h | 6
xgc/ChangeLog | 49
xgc/INSTALL | 121
xgc/Makefile.in | 456 +-
xgc/aclocal.m4 | 815 ++--
xgc/compile | 347 ++
xgc/config.guess | 363 --
xgc/config.sub | 150
xgc/configure | 935 +++--
xgc/configure.ac | 5
xgc/depcomp | 487 +-
xgc/install-sh | 374 +-
xgc/man/Makefile.in | 129
xgc/missing | 461 --
xgc/tests.c | 1
xgc/ylwrap | 205 -
xmag/ChangeLog | 61
xmag/CutPaste.c | 16
xmag/INSTALL | 121
xmag/Makefile.in | 434 +-
xmag/RootWin.c | 2
xmag/Scale.c | 352 +-
xmag/Scale.h | 14
xmag/aclocal.m4 | 815 ++--
xmag/compile | 347 ++
xmag/config.guess | 363 --
xmag/config.sub | 150
xmag/configure | 935 +++--
xmag/configure.ac | 10
xmag/depcomp | 487 +-
xmag/install-sh | 374 +-
xmag/man/Makefile.in | 129
xmag/missing | 461 --
xmag/xmag.c | 199 -
xman/ChangeLog | 114
xman/INSTALL | 121
xman/Makefile.in | 54
xman/aclocal.m4 | 173 -
xman/buttons.c | 4
xman/compile | 2
xman/config.guess | 201 -
xman/config.sub | 51
xman/configure | 410 +-
xman/configure.ac | 10
xman/depcomp | 2
xman/handler.c | 10
xman/install-sh | 366 +-
xman/main.c | 4
xman/man.c | 7
xman/man/Makefile.in | 29
xman/misc.c | 4
xman/missing | 6
xman/search.c | 10
xman/vendor.h | 4
202 files changed, 29801 insertions(+), 18191 deletions(-)
New commits:
commit b291922f874bacf018b9af6ce3f6a5e06312e5f8
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 23:57:25 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 0c6fd49..09c2df0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7+5) UNRELEASED; urgency=medium
+x11-apps (7.7+5) unstable; urgency=medium
* bitmap 1.0.8.
* x11perf 1.6.0.
@@ -11,7 +11,7 @@ x11-apps (7.7+5) UNRELEASED; urgency=medium
* Remove cpp from Depends (closes: #778804).
* Bump debhelper compat level to 9.
- -- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 23:22:46 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 23:57:18 +0200
x11-apps (7.7+4) unstable; urgency=medium
commit 8e4cdabbcb52b8f46451c117893c70f9a12950f4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 23:50:35 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 4d3e71d..0c6fd49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-apps (7.7+5) UNRELEASED; urgency=medium
* xmag 1.0.6.
* xman 1.1.4.
* Remove cpp from Depends (closes: #778804).
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 23:22:46 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index fd4f14b..c863268 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 7.0.50),
+ debhelper (>= 9),
pkg-config,
dh-autoreconf,
# XXX bison build-dep is to work around a bug in xgc's configure, remove as
diff --git a/debian/rules b/debian/rules
index 383e25a..0c4b1ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ override_dh_auto_configure: $(CONFIG_STAMPS)
$(STAMP_DIR)/configure-%:
mkdir -p $(STAMP_DIR)
dh_auto_configure -D$* -B$*-build -- \
+ --libdir=\$${prefix}/lib \
--disable-silent-rules \
MANCONF="/etc/manpath.config"
>$@
commit b6fc4b98b6f11943c423194382c38b0d093790be
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 23:41:57 2015 +0200
Remove cpp from Depends (closes: #778804).
diff --git a/debian/changelog b/debian/changelog
index d270837..4d3e71d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-apps (7.7+5) UNRELEASED; urgency=medium
* xgc 1.0.5.
* xmag 1.0.6.
* xman 1.1.4.
+ * Remove cpp from Depends (closes: #778804).
-- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 23:22:46 +0200
diff --git a/debian/control b/debian/control
index f09b1d2..fd4f14b 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
Package: x11-apps
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cpp, man-db
+Depends: ${shlibs:Depends}, ${misc:Depends}, man-db
Recommends: xbitmaps
Suggests: mesa-utils
Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
commit e5d74b5fb6d0ffa0a2eb2816cee6ac08d4b006b2
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 23:29:00 2015 +0200
xman 1.1.4.
diff --git a/debian/changelog b/debian/changelog
index c56157c..d270837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11-apps (7.7+5) UNRELEASED; urgency=medium
* xedit 1.2.2.
* xgc 1.0.5.
* xmag 1.0.6.
+ * xman 1.1.4.
-- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 23:22:46 +0200
diff --git a/xman/ChangeLog b/xman/ChangeLog
index eb8aa49..56939b9 100644
--- a/xman/ChangeLog
+++ b/xman/ChangeLog
@@ -1,3 +1,117 @@
+commit 27ae1a020119b5254c0238ef60a1ba602befba56
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 6 19:06:48 2015 -0800
+
+ xman 1.1.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4e70edc503ad153c4223995ae5fb4adf980b01bd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Nov 12 19:25:49 2014 -0800
+
+ Ask groff for text instead of postscript on Solaris
+
+ In the last case fallback to groff in #ifdef HANDLE_ROFFSEQ, it
+ was just running "groff -man", which generates postscript output,
+ which xman displays as a text dump of the postscript source, not
+ very readable.
+
+ Hit on Solaris since it wasn't caught by the earlier checks for
+ CSRG_BASED, linux, __CYGWIN__, and __DARWIN__, which cover most
+ other cases.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ddb35139f98bcf276ef328db00961dc5a1b4ecf7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jul 11 20:12:43 2014 -0700
+
+ Fix typos & wording issues in source comments
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b07a3b3bc4c039bf0c2b03c3c60eae7c86c6fc6e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 31 23:35:02 2014 -0700
+
+ autogen.sh: Honor NOCONFIGURE=1
+
+ See http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c9919b02bb41013789dc28f63285483ca8b18740
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 31 23:35:01 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f6ae31ee1da66ecdd9ad049a5aa4fe82aca209c8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 31 23:34:53 2014 -0700
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e3a9f82775946f056e997df4528e5ff536edf4a5
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Thu May 22 00:16:59 2014 +0200
+
+ Fix shadow warning.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+
+commit bb926ce84421b1fc9795c229ce32332b77a4b18d
+Author: Jörg Sonnenberger <joerg@NetBSD.org>
+Date: Thu May 22 00:15:36 2014 +0200
+
+ Fix tautology to the intended check.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+
+commit 15382f62a734d5b4bde30378dab525deadae72c2
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Feb 19 14:51:34 2014 +0000
+
+ Use same FORMAT command on cygwin as on linux in HANDLE_ROFFSEQ case as well
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit a2976b6403ce3a98e8bb4f8db8c1703588800ee8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 18 23:23:44 2013 -0700
+
+ Ensure fgets read at least one byte before modifying string
+
+ If a file has a \0 byte (binary file, strange encoding, corruption),
+ fgets() can return a string starting with a \0 byte - check for that
+ before checking to see if the byte before the \0 is a \n, so we don't
+ reach back before the start of our memory buffer.
+
+ Also check that the penultimate byte is a \n before we chop it off,
+ in case we're reading from a file missing a newline, or a line longer
+ than fit in the buffer provided to fgets().
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 617209a03a219abfd0fc626be1a038d20443178b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 8 09:11:57 2013 -0700
+
+ Fix "no search will be preformed" typo in dialog box message
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 46c0034ae501360edb541082d0eadb23babf302e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 6 23:46:22 2013 -0700
diff --git a/xman/INSTALL b/xman/INSTALL
index 8b82ade..a1e89e1 100644
--- a/xman/INSTALL
+++ b/xman/INSTALL
@@ -1,11 +1,13 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
@@ -13,7 +15,11 @@ 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.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@ may remove or edit it.
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ 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.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
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
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. 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
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
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.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
@@ -93,7 +116,8 @@ 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 `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
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
@@ -120,7 +144,8 @@ 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'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -131,15 +156,46 @@ 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.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
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
@@ -152,6 +208,13 @@ 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.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
Particular systems
==================
@@ -159,10 +222,15 @@ Particular systems
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
- ./configure CC="cc -Ae"
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
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
@@ -174,6 +242,16 @@ and if that doesn't work, try
./configure CC="cc -nodtk"
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
@@ -189,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ 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
@@ -277,7 +356,7 @@ operates.
`configure' can determine that directory automatically.
`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
+ Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
diff --git a/xman/Makefile.in b/xman/Makefile.in
index ba1ddc7..62e1d63 100644
--- a/xman/Makefile.in
+++ b/xman/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -37,7 +37,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -102,15 +112,13 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xman$(EXEEXT)
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in depcomp $(dist_appdefault_DATA) \
- $(dist_help_DATA) 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) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(dist_appdefault_DATA) \
+ $(dist_help_DATA) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -228,6 +236,9 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
+ ChangeLog INSTALL README compile config.guess config.sub \
+ depcomp install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -318,7 +329,6 @@ LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
@@ -435,7 +445,7 @@ all: config.h
.SUFFIXES: .c .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -448,7 +458,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -462,9 +471,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
@@ -475,7 +484,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(srcdir)/config.h.in: $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -792,15 +801,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -836,16 +845,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1032,6 +1042,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
uninstall-dist_helpDATA
+.PRECIOUS: Makefile
+
.PHONY: ChangeLog INSTALL
diff --git a/xman/aclocal.m4 b/xman/aclocal.m4
index 836cb94..7f6d556 100644
--- a/xman/aclocal.m4
+++ b/xman/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,13 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
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'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
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.14], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -642,45 +645,9 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
Reply to: