x11-apps: Changes to 'debian-unstable'
debian/changelog | 3
xbiff/COPYING | 29
xbiff/ChangeLog | 291 +
xbiff/INSTALL | 143
xbiff/Mailbox.c | 107
xbiff/Makefile.am | 16
xbiff/Makefile.in | 416 +-
xbiff/README | 27
xbiff/aclocal.m4 | 1931 ++++++------
xbiff/compile | 142
xbiff/config.guess | 291 -
xbiff/config.h.in | 42
xbiff/config.sub | 161 -
xbiff/configure | 5424 +++++++++++++++++++----------------
xbiff/configure.ac | 18
xbiff/depcomp | 172 -
xbiff/install-sh | 517 ++-
xbiff/missing | 104
xbiff/mkinstalldirs | 158 -
xbiff/xbiff.c | 14
xcalc/ChangeLog | 123
xcalc/INSTALL | 143
xcalc/Makefile.am | 38
xcalc/Makefile.in | 440 +-
xcalc/README | 26
xcalc/XCalc-color.ad | 225 -
xcalc/XCalc.ad | 530 ---
xcalc/aclocal.m4 | 1949 ++++++------
xcalc/actions.c | 347 --
xcalc/actions.h | 94
xcalc/app-defaults/XCalc | 530 +++
xcalc/app-defaults/XCalc-color | 225 +
xcalc/autogen.sh | 13
xcalc/config.guess | 271 -
xcalc/config.h.in | 33
xcalc/config.sub | 139
xcalc/configure | 6298 ++++++++++++++++++++++++-----------------
xcalc/configure.ac | 22
xcalc/depcomp | 172 -
xcalc/install-sh | 517 ++-
xcalc/math.c | 119
xcalc/missing | 104
xcalc/xcalc.c | 79
xcalc/xcalc.h | 42
xeyes/ChangeLog | 79
xeyes/Makefile.am | 10
xeyes/Makefile.in | 26
xeyes/aclocal.m4 | 25
xeyes/config.guess | 88
xeyes/config.sub | 28
xeyes/configure | 1269 ++++++--
xeyes/configure.ac | 9
52 files changed, 14187 insertions(+), 9832 deletions(-)
New commits:
commit 384ec30ba0c7b57a9626c6dd6ee113a0a8f70aa9
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Dec 20 09:43:59 2009 +0100
xbiff 1.0.2
diff --git a/debian/changelog b/debian/changelog
index 1eb9cda..c6c6d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
* Update debian/copyright and package description according
to ico and xedit additions.
* x11pref 1.5.1.
+ * xbiff 1.0.2.
* xcalc 1.0.3.
* xeyes 1.1.0.
* xlogo 1.0.2.
diff --git a/xbiff/AUTHORS b/xbiff/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/xbiff/COPYING b/xbiff/COPYING
index 7f33cbf..2836b5a 100644
--- a/xbiff/COPYING
+++ b/xbiff/COPYING
@@ -1,12 +1,25 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1988 X Consortium
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
diff --git a/xbiff/ChangeLog b/xbiff/ChangeLog
index c7a87f5..9cf2a39 100644
--- a/xbiff/ChangeLog
+++ b/xbiff/ChangeLog
@@ -1,30 +1,285 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6b546577aadec95c09da148936dbfd55b9cd0216
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 17 08:32:12 2009 -0800
- * configure.ac:
- Update package version for X11R7 release.
+ xbiff 1.0.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 82e802ad978b110dd093b620e91589ca689dcff6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 17 08:25:19 2009 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Fill in COPYING with notices from source code
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d8c551691ff2c28b2d90af47ada68bc3ee78bdc8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Nov 26 09:19:52 2009 -0500
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c7475f38f7aec802914af26043bb0d950880a77e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit be7954a66400b0efacf01d159752f5ea2886564f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:38 2009 -0400
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4511a4a0030b9a33a6056f76a5e126d76611c463
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+commit 111206b3ad0b0536bdc8c39425f79f50665c3000
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 12 18:34:18 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 492785cb489963cff20e7d20b87d33ffa5508247
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Oct 1 14:54:20 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit b88273dcdd403e058888fbcdf4a0470854045179
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Tue Jan 13 20:54:08 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit 4882f2fc26a5976fe7744286932263c83f1c61dc
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Aug 20 10:32:49 2008 -0400
+
+ xaw8 is gone, use xaw7
+
+commit bdd747628f08de80eb311d6e7ef2cd1dd9b34943
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:09 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit e00caacfa0a86692928f81039ece9341745bc3d0
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:15 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit e3abf6683d15c67e796a395b30437fd01ff3b538
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:24:40 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 0365e1a08ddb0c5961a0c52f9cf4a8368cf312e5
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:48 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 7ad243529fe6d78e52dea5a22a24f7f83a22ba62
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:42 2005 +0000
+
+ Stub COPYING files
+
+commit efd4fed0e413ddf6d93c366041f6cb9a6e622375
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:04 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit d54d4ef448b3e16ec9151c6dd4143ca32eaf32a5
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:19 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit a2cf84dad681150f17186bc929e4958017d19d8c
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:18 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 96700fc277e1a211aca0fe1b2e87d87d7f359fcc
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:39 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit ca0fb29b3fe6e8b574dfe2e692734127ab7a3d43
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:34:58 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit acded00af405734d1611db4fe6d0e9940b8bd326
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:50 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 8114be741f5386cebfa24de82474b49c438dc78d
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:36 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 3097fcab22bf84f0bb6faee69c99c950a79bb1c4
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:52 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 7aeb50852f7111ba9a4ad3404bea0d20e1602502
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit c080a49a36c2f90fae774550553791da721e9240
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:43 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit ae73bd0c0087ebde446d6e4956242088a315ab6c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Sep 27 18:35:34 2005 +0000
+
+ Fix configure.ac to not require xaw8 unconditionally.
+
+commit 25b5d282c0264508adbd695010632cde93f55a2f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:29 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit b89877374f51e8b9c83ca1aa55e246391038ffba
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:31 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit a8d1903bfd5ee45e6736427be85adef5624d661a
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Jul 23 15:46:06 2005 +0000
+
+ xbiff depends on Xaw
+
+commit d9ea3ae597b97c173faa6dd29077ddf3a4bbc5ac
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:51 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit df4faebea1a9a32c5c4b78a2585cbf6a443181a7
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Sat Jul 16 21:40:42 2005 +0000
+
+ Add _BSD_SOURCE - patch from Stefan Dirsch
+
+commit b3b0fffccaec04ca4bf47409dc39fba17819ee06
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Fri Jul 15 16:53:50 2005 +0000
+
+ Add dependency on xbitmaps
+
+commit ee0c19e43392bb8bc343a617d92e3784845511b6
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 6 15:21:38 2005 +0000
+
+ Build system for xbiff
+
+commit dbaae0652239411598a00da1ee5af65a5b101a98
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:38 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit fd6ce9234674249a5ef7cc6fb3a13d3ff604a24a
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:00 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d0ae3505f328fbc52752a17b7d3033021ce2b0c3
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:55 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit c946d9c9cf9222327544ca677e26de0fe796ba95
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 1fb603e5ba366ab79a17f6d79f7fc6dd6988cda6
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:58 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 8dcf7ae639f46e982131632b7cc0c37a8fd4ee97
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:03 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit f2fc3bc2312c7af4f0cd5fee2e08be7c0ca115b3
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 248f03b4a519c635bdfa16ae1c7aa708a006c580
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ Initial revision
diff --git a/xbiff/INSTALL b/xbiff/INSTALL
index 23e5f25..8b82ade 100644
--- a/xbiff/INSTALL
+++ b/xbiff/INSTALL
@@ -1,16 +1,19 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+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
+ 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.
+ 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
@@ -23,9 +26,9 @@ 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
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+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
@@ -35,20 +38,17 @@ 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'.
+`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. 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.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ 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.
@@ -67,42 +67,57 @@ 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.
+
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.
+ 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
+ ./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
+ 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
+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 `..'.
- 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.
+ 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
+ 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'.
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ 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
@@ -137,14 +152,36 @@ 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
+ 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:
@@ -170,9 +207,9 @@ 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'.
+ 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.
@@ -181,7 +218,7 @@ 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
+ 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
@@ -190,21 +227,29 @@ 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:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ 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'
@@ -231,6 +276,16 @@ configuration-related scripts to be executed by `/bin/bash'.
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/xbiff/Mailbox.c b/xbiff/Mailbox.c
index 5b1cabf..d7f7fb8 100644
--- a/xbiff/Mailbox.c
+++ b/xbiff/Mailbox.c
@@ -106,7 +106,9 @@ typedef union wait waitType;
static char defaultTranslations[] =
"<ButtonPress>: unset()";
-static void Check(), Set(), Unset();
+static void Set (Widget gw, XEvent *event, String *params, Cardinal *nparams);
+static void Check(Widget gw, XEvent *event, String *params, Cardinal *nparams);
+static void Unset(Widget gw, XEvent *event, String *params, Cardinal *nparams);
static XtActionsRec actionsList[] = {
{ "check", Check },
@@ -157,10 +159,20 @@ static XtResource resources[] = {
#undef offset
#undef goffset
-static void GetMailFile(), CloseDown();
-static void check_mailbox(), redraw_mailbox(), beep();
-static void Initialize(), Realize(), Destroy(), Redisplay();
-static Boolean SetValues();
+static void GetMailFile(MailboxWidget w);
+static void CloseDown (MailboxWidget w, int status);
+
+static void check_mailbox(MailboxWidget w, Boolean force_redraw, Boolean reset);
+static void redraw_mailbox (MailboxWidget w);
+static void beep (MailboxWidget w);
+static void Initialize (Widget request, Widget new,
+ ArgList args, Cardinal *num_args);
+static void Realize (Widget gw, XtValueMask *valuemaskp,
+ XSetWindowAttributes *attr);
+static void Destroy (Widget gw);
+static void Redisplay (Widget gw, XEvent *event, Region region);
+static Boolean SetValues (Widget gcurrent, Widget grequest, Widget gnew,
+ ArgList args, Cardinal *num_args);
MailboxClassRec mailboxClassRec = {
{ /* core fields */
@@ -212,8 +224,7 @@ WidgetClass mailboxWidgetClass = (WidgetClass) &mailboxClassRec;
* widget initialization
*/
-static GC get_mailbox_gc (w)
- MailboxWidget w;
+static GC get_mailbox_gc (MailboxWidget w)
{
XtGCMask valuemask;
XGCValues xgcv;
@@ -228,10 +239,8 @@ static GC get_mailbox_gc (w)
/* ARGSUSED */
-static void Initialize (request, new, args, num_args)
- Widget request, new;
- ArgList args;
- Cardinal *num_args;
+static void Initialize (Widget request, Widget new,
+ ArgList args, Cardinal *num_args)
{
MailboxWidget w = (MailboxWidget) new;
int shape_event_base, shape_error_base;
@@ -264,19 +273,13 @@ static void Initialize (request, new, args, num_args)
*/
/* ARGSUSED */
-static void Set (gw, event, params, nparams)
- Widget gw;
- XEvent *event;
- String *params;
- Cardinal *nparams;
+static void Set (Widget gw, XEvent *event, String *params, Cardinal *nparams)
{
MailboxWidget w = (MailboxWidget) gw;
w->mailbox.last_size = -1;
check_mailbox (w, TRUE, FALSE); /* redraw, no reset */
-
- return;
}
@@ -285,17 +288,11 @@ static void Set (gw, event, params, nparams)
*/
/* ARGSUSED */
-static void Unset (gw, event, params, nparams)
- Widget gw;
- XEvent *event;
- String *params;
- Cardinal *nparams;
+static void Unset (Widget gw, XEvent *event, String *params, Cardinal *nparams)
{
MailboxWidget w = (MailboxWidget) gw;
check_mailbox (w, TRUE, TRUE); /* redraw, reset */
-
- return;
}
@@ -304,24 +301,16 @@ static void Unset (gw, event, params, nparams)
*/
/* ARGSUSED */
-static void Check (gw, event, params, nparams)
- Widget gw;
- XEvent *event;
- String *params;
- Cardinal *nparams;
+static void Check (Widget gw, XEvent *event, String *params, Cardinal *nparams)
{
MailboxWidget w = (MailboxWidget) gw;
check_mailbox (w, TRUE, FALSE); /* redraw, no reset */
-
- return;
}
/* ARGSUSED */
-static void clock_tic (client_data, id)
- XtPointer client_data;
- XtIntervalId *id;
+static void clock_tic (XtPointer client_data, XtIntervalId *id)
{
MailboxWidget w = (MailboxWidget) client_data;
@@ -338,13 +327,8 @@ static void clock_tic (client_data, id)
return;
}
-static Pixmap make_pixmap (dpy, w, bitmap, depth, flip, widthp, heightp)
- Display *dpy;
- MailboxWidget w;
- Pixmap bitmap;
- Boolean flip;
- int depth;
- int *widthp, *heightp;
+static Pixmap make_pixmap (Display *dpy, MailboxWidget w, Pixmap bitmap,
+ int depth, Boolean flip, int *widthp, int *heightp)
{
Window root;
int x, y;
@@ -367,10 +351,8 @@ static Pixmap make_pixmap (dpy, w, bitmap, depth, flip, widthp, heightp)
width, height, depth, fore, back);
}
-static void Realize (gw, valuemaskp, attr)
- Widget gw;
- XtValueMask *valuemaskp;
- XSetWindowAttributes *attr;
+static void Realize (Widget gw, XtValueMask *valuemaskp,
+ XSetWindowAttributes *attr)
{
MailboxWidget w = (MailboxWidget) gw;
register Display *dpy = XtDisplay (w);
@@ -421,8 +403,7 @@ static void Realize (gw, valuemaskp, attr)
}
-static void Destroy (gw)
- Widget gw;
+static void Destroy (Widget gw)
{
MailboxWidget w = (MailboxWidget) gw;
Display *dpy = XtDisplay (gw);
@@ -439,14 +420,10 @@ static void Destroy (gw)
freepix (w->mailbox.empty.pixmap);
freepix (w->mailbox.shape_cache.mask);
#undef freepix
- return;
}
-static void Redisplay (gw, event, region)
- Widget gw;
- XEvent *event;
- Region region;
+static void Redisplay (Widget gw, XEvent *event, Region region)
{
MailboxWidget w = (MailboxWidget) gw;
@@ -454,9 +431,7 @@ static void Redisplay (gw, event, region)
}
-static void check_mailbox (w, force_redraw, reset)
- MailboxWidget w;
- Boolean force_redraw, reset;
+static void check_mailbox (MailboxWidget w, Boolean force_redraw, Boolean reset)
{
long mailboxsize = 0;
Boolean readSinceLastWrite = FALSE;
@@ -541,8 +516,7 @@ static void check_mailbox (w, force_redraw, reset)
* get user name for building mailbox
*/
-static void GetMailFile (w)
- MailboxWidget w;
+static void GetMailFile (MailboxWidget w)
{
char *username;
char *mailpath;
@@ -553,7 +527,6 @@ static void GetMailFile (w)
CloseDown (w, 1);
}
#else
- char *getlogin();
username = getlogin ();
if (!username) {
@@ -580,9 +553,7 @@ static void GetMailFile (w)
return;
}
-static void CloseDown (w, status)
- MailboxWidget w;
- int status;
+static void CloseDown (MailboxWidget w, int status)
{
Display *dpy = XtDisplay (w);
@@ -593,10 +564,8 @@ static void CloseDown (w, status)
/* ARGSUSED */
-static Boolean SetValues (gcurrent, grequest, gnew, args, num_args)
- Widget gcurrent, grequest, gnew;
- ArgList args;
- Cardinal *num_args;
+static Boolean SetValues (Widget gcurrent, Widget grequest, Widget gnew,
+ ArgList args, Cardinal *num_args)
{
MailboxWidget current = (MailboxWidget) gcurrent;
MailboxWidget new = (MailboxWidget) gnew;
@@ -626,8 +595,7 @@ static Boolean SetValues (gcurrent, grequest, gnew, args, num_args)
* drawing code
*/
-static void redraw_mailbox (w)
- MailboxWidget w;
+static void redraw_mailbox (MailboxWidget w)
{
register Display *dpy = XtDisplay (w);
register Window win = XtWindow (w);
@@ -679,8 +647,7 @@ static void redraw_mailbox (w)
}
-static void beep (w)
- MailboxWidget w;
+static void beep (MailboxWidget w)
{
XBell (XtDisplay (w), w->mailbox.volume);
return;
diff --git a/xbiff/Makefile.am b/xbiff/Makefile.am
index 1703172..b49c553 100644
--- a/xbiff/Makefile.am
+++ b/xbiff/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xbiff
-xbiff_CFLAGS = $(XBIFF_CFLAGS) -D_BSD_SOURCE
+AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE
xbiff_LDADD = $(XBIFF_LIBS)
xbiff_SOURCES = \
@@ -40,6 +40,7 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
SED = sed
@@ -64,4 +65,15 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/xbiff/Makefile.in b/xbiff/Makefile.in
index 66ebe42..69764ba 100644
--- a/xbiff/Makefile.in
+++ b/xbiff/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -36,15 +37,12 @@
# PERFORMANCE OF THIS SOFTWARE.
Reply to: