diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 15:35:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 15:35:50 +0000 |
| commit | 0b717b7b47b345d8b21439884c883db90bc6d6bb (patch) | |
| tree | bf4f7f19c7f61b3b8fb3c5e4759ce5466d9cc6d5 /lib/libXmu | |
| parent | c13cd760dbb55d95e6665cda406fd4a169afa0f1 (diff) | |
Update to libXmu 1.1.0. No functional change.
Diffstat (limited to 'lib/libXmu')
84 files changed, 8646 insertions, 2663 deletions
diff --git a/lib/libXmu/ChangeLog b/lib/libXmu/ChangeLog index 78379de0c..e2de80105 100644 --- a/lib/libXmu/ChangeLog +++ b/lib/libXmu/ChangeLog @@ -1,3 +1,339 @@ +commit 5d9b0896bfdfe60656a2d806a06e17c7adf335b5 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Oct 29 16:52:54 2010 -0700 + + libXmu 1.1.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 28f4666ad88ab736f52c1cb16674226f14bc2a15 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Oct 28 12:24:30 2010 -0700 + + Remove unnecessary calls from configure.ac + + AC_PROG_CC is handled by XORG_DEFAULT_OPTIONS + AC_SUBST of *_LIBS & *_CFLAGS are handled by PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 1ab19053c75b44be9c49700b1190dd5d8da152ce +Author: Jesse Adkins <jesserayadkins@gmail.com> +Date: Tue Sep 28 13:30:03 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 75a065b9b8145bac20d9080cb5237a25bb3ad190 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Aug 3 13:23:32 2010 -0400 + + specs: xsl stylesheet requires abs path to images + + Using abs_builddir requires automake 1.10 or later. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit b56c3e61038c7cdb49bdb40455c2b3a12ae35d3c +Author: Fernando Carrijo <fcarrijo@yahoo.com.br> +Date: Thu Jul 1 07:00:53 2010 -0300 + + Purge macro NEED_EVENTS + + Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br> + Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e721c444a8268db0406e26d65e0a4746c477750f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Jun 25 15:06:39 2010 -0400 + + config: use HAVE_XMLTO_TEXT from XORG_WITH_XMLTO + + Skip text format when XMLTO dependencies for text format + are missing (lynx, links or w3m) + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 449bc79585f324c5695f379def1e57fe9fcec2e6 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Jun 25 15:02:59 2010 -0400 + + config: use HAVE_STYLESHEET now defined in XORG_CHECK_SGML_DOCTOOLS + + Also use STYLESHEET_SRCDIR XSL_STYLESHEET + + This requires version 1.10 of util-macros + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 167c191895d956831f76ece5f2bdbef8cea4ed45 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Jun 25 14:10:58 2010 -0400 + + config: move docs ignore from toplevel .gitignore to /doc + + Also add missing *.css + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 2d8fa1b7905bbbc37f42f651ed1f881359ac6a09 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 23 08:02:08 2010 -0700 + + Add xorg.css to CLEANFILES to pass make distcheck + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f7e752f3842fddff907901cccb45dde77c297d20 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 15 22:06:15 2010 -0700 + + Use shared stylesheets from xorg-sgml-doctools instead of a private copy + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ffef5f4ee489a7f2d228601ee351bc2445436304 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Jun 19 22:34:50 2010 -0700 + + Add some cross-reference links and an index to the docs + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 0a198dd15c7963f7b9be094370761cac368d9292 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 9 15:48:58 2010 -0700 + + Xmu.xml: Compilers that can't handle void are now ancient history + + Plus a bonus it's -> its typo fix + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit dc02453cde3047bce48a8ca23c27c807642b1670 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 9 11:30:17 2010 -0700 + + Use _X_ATTRIBUTE_PRINTF from Xfuncproto.h in Xmu headers + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> + Reviewed-by: Julien Cristau <jcristau@debian.org> + +commit eb8ed42cc7f40d8dd506aeebb759dd99dac1552e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 9 11:25:12 2010 -0700 + + Document which functions are in libXmu vs. libXmuu + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit bde1baeddb216b7ab6322646d9bdf3bb629c4c25 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 9 11:04:17 2010 -0700 + + Add XmuNCopyISOLatin1Lowered & XmuNCopyISOLatin1Uppered to doc/Xmu.xml + + Also add notes to the originals warning about buffer overflow + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6b98e89515ba0ee755bdc9c4783b84b464d2a10c +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 9 10:50:23 2010 -0700 + + Update docs to match headers + + - caddr_t is now XPointer + - a number of char * arguments are now unsigned char * or constified + - XmuLookup* functions are in Lookup.h, so split into new section + + There are still a bunch of headers with undocumented functions/#defines: + - CvtCache.h + - EditresP.h + - ExtAgent.h + - Misc.h + - WhitePoint.h + - Xmu.h + - some of the functions in Converters.h + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 13409196c36151e4b5212ae08e6cfda6d7c93696 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Jun 9 10:23:08 2010 -0700 + + Add XmuSnprintf to doc/Xmu.xml + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a4a87ddfa4948c3f5c210ab7a472b65569ae0e64 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 8 21:20:58 2010 -0700 + + Show X logo as a figure for XmuDrawLogo + + Because we can. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 5e22a1fb7c2bae8d5b393b95b253c865c9eed309 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 8 16:51:41 2010 -0700 + + Fix distcheck (forgot to mark Xmu.xml as dist_*) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f38c2c057ebca8ca4afc2cb8fb835702bdba4fc6 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 8 16:25:49 2010 -0700 + + Correct some minor typos in original document + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 70596fce92bd58d46e19de63b6c3faca38cbc181 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 8 16:19:49 2010 -0700 + + Convert Xmu.ms to DocBook/xml + + Bumps xorg-macros requirement to 1.6 for XORG_ENABLE_DOCS & friends + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 868ed2d97150aed414a7fd8f5dc317b8f38b05fd +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jun 7 15:51:32 2010 -0700 + + Move doc/Xmu.ms from xorg-docs module + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit af962b3bed9d3c42cf81946a5732f0d37d1843e8 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed May 26 17:01:57 2010 -0400 + + config: add WhitePoint.h to the include headers + + This file was added in commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26 + because it was missing from the tarball. It was added to + EXTRA_DIST so it never got installed in $includedir. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit bae14e85d90a4ea040cb1b25ba89c98a0ebe1670 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Apr 5 20:10:35 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit a6210dd05cfe92d0af2e23358851c3a38c2aaca6 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Mar 29 14:53:49 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 1de26ffbdec68f8ca6aa2448869a323bcceda26d +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sat Mar 27 16:19:35 2010 -0400 + + config: remove execute permission on source C file + + Introduced in 85f77401635dfa57d40de89aa2c9f39a344a8d3b + "Fix build problems on WIN32 platforms" + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit d2702478f3d36fb3053b9796657310750e5e5738 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 8d5e9bd04c8cc90a262223f8a16c4ac7c0c66c2d +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Oct 28 14:09:10 2009 -0400 + + 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. + +commit 80650c71c06b87e8a5ff0122c1f2bf7798ab2e96 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 1dba944c770fcc4b276641e0ae01e2e4371dc101 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Oct 26 22:08:43 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 854456de21a1e722edd5e03ba8467107401fd7b6 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Oct 22 12:34:19 2009 -0400 + + .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 ab323caeb2b763abc8986fe71531dedb62ec9720 +Author: Jeremy Huddleston <jeremyhu@freedesktop.org> +Date: Wed Oct 21 12:47:25 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> + commit c2c76abe51878f55e22c44c747f1243e56a4344b Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Sep 23 17:53:41 2009 -0700 diff --git a/lib/libXmu/INSTALL b/lib/libXmu/INSTALL index 23e5f25d0..2aefa98ef 100644 --- a/lib/libXmu/INSTALL +++ b/lib/libXmu/INSTALL @@ -23,9 +23,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 +35,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,6 +64,9 @@ 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 ===================== @@ -78,7 +78,7 @@ details on some of the pertinent environment variables. 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. @@ -137,6 +137,28 @@ 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 ========================== @@ -204,7 +226,14 @@ configuration-related scripts to be executed by `/bin/bash'. `--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 +260,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/lib/libXmu/Makefile.am b/lib/libXmu/Makefile.am index 955bcb9e2..9a875e369 100644 --- a/lib/libXmu/Makefile.am +++ b/lib/libXmu/Makefile.am @@ -1,21 +1,19 @@ -SUBDIRS = include src +SUBDIRS = include src doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xmu.pc xmuu.pc -EXTRA_DIST = \ - xmu.pc.in \ - xmuu.pc.in \ - include/X11/Xmu/WhitePoint.h \ - ChangeLog -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT # Check source code with tools like lint & sparse diff --git a/lib/libXmu/Makefile.bsd-wrapper b/lib/libXmu/Makefile.bsd-wrapper index 0de075c4c..4976a8bbc 100644 --- a/lib/libXmu/Makefile.bsd-wrapper +++ b/lib/libXmu/Makefile.bsd-wrapper @@ -1,5 +1,7 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2007/03/15 23:00:47 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2010/10/31 15:35:49 matthieu Exp $ SHARED_LIBS= Xmu 10.0 Xmuu 5.0 +CONFIGURE_ARGS+= --disable-docs --without-fop --without-xmlto + .include <bsd.xorg.mk> diff --git a/lib/libXmu/Makefile.in b/lib/libXmu/Makefile.in index 17d371c8a..acbf14ec7 100644 --- a/lib/libXmu/Makefile.in +++ b/lib/libXmu/Makefile.in @@ -81,12 +81,14 @@ am__remove_distdir = \ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AR = @AR@ @@ -116,13 +118,25 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ GREP = @GREP@ HAS_SNPRINTF = @HAS_SNPRINTF@ +HAVE_FOP_FALSE = @HAVE_FOP_FALSE@ +HAVE_FOP_TRUE = @HAVE_FOP_TRUE@ +HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@ +HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@ +HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ +HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ +HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ +HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -147,6 +161,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@ MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NMEDIT = @NMEDIT@ @@ -164,11 +179,16 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ +XMLTO = @XMLTO@ XMUU_CFLAGS = @XMUU_CFLAGS@ XMUU_LIBS = @XMUU_LIBS@ XMU_CFLAGS = @XMU_CFLAGS@ XMU_LIBS = @XMU_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ @@ -189,7 +209,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -217,16 +236,10 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = include src +SUBDIRS = include src doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xmu.pc xmuu.pc -EXTRA_DIST = \ - xmu.pc.in \ - xmuu.pc.in \ - include/X11/Xmu/WhitePoint.h \ - ChangeLog - -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -237,15 +250,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -448,7 +461,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/include/X11/Xmu + $(mkdir_p) $(distdir)/. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -693,12 +706,15 @@ uninstall-info: uninstall-info-recursive uninstall-pkgconfigDATA -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL # Check source code with tools like lint & sparse @LINT_TRUE@lint: diff --git a/lib/libXmu/README b/lib/libXmu/README index c7f4dcc24..dbf260e11 100644 --- a/lib/libXmu/README +++ b/lib/libXmu/README @@ -7,8 +7,10 @@ may choose not to distribute this library if they wish. Therefore, applications developers who depend on this library should be prepared to treat it as part of their software base when porting. -API documentation for this library is provided in the xorg-docs module, -in the file specs/Xmu/Xmu.ms. +API documentation for this library is provided in the docs directory in +DocBook format. If xmlto is installed, it will be converted to supported +formats and installed in $(docdir) unless --disable-docs is passed to +configure. All questions regarding this software should be directed at the Xorg mailing list: diff --git a/lib/libXmu/aclocal.m4 b/lib/libXmu/aclocal.m4 index 2a129f349..1c620d533 100644 --- a/lib/libXmu/aclocal.m4 +++ b/lib/libXmu/aclocal.m4 @@ -7633,32 +7633,26 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the -dnl "Software"), to deal in the Software without restriction, including -dnl without limitation the rights to use, copy, modify, merge, publish, -dnl distribute, and/or sell copies of the Software, and to permit persons -dnl to whom the Software is furnished to do so, provided that the above -dnl copyright notice(s) and this permission notice appear in all copies of -dnl the Software and that both the above copyright notice(s) and this -dnl permission notice appear in supporting documentation. +dnl copy of this software and associated documentation files (the "Software"), +dnl to deal in the Software without restriction, including without limitation +dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, +dnl and/or sell copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following conditions: dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl The above copyright notice and this permission notice (including the next +dnl paragraph) shall be included in all copies or substantial portions of the +dnl Software. dnl -dnl Except as contained in this notice, the name of a copyright holder -dnl shall not be used in advertising or otherwise to promote the sale, use -dnl or other dealings in this Software without prior written authorization -dnl of the copyright holder. +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +dnl DEALINGS IN THE SOFTWARE. # XORG_MACROS_VERSION(required-version) # ------------------------------------- @@ -7676,7 +7670,7 @@ dnl of the copyright holder. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.3.0]) +m4_define([vers_have], [1.11.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -7744,9 +7738,12 @@ AC_SUBST(RAWCPPFLAGS) # on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. # Not sure if there's any better way than just hardcoding by OS name. # Override default settings by setting environment variables +# Added MAN_SUBSTS in version 1.8 +# Added AC_PROG_SED in version 1.8 AC_DEFUN([XORG_MANPAGE_SECTIONS],[ AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_SED]) if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 @@ -7815,8 +7812,60 @@ AC_SUBST([FILE_MAN_DIR]) AC_SUBST([MISC_MAN_DIR]) AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) + +XORG_MAN_PAGE="X Version 11" +AC_SUBST([XORG_MAN_PAGE]) +MAN_SUBSTS="\ + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" +AC_SUBST([MAN_SUBSTS]) + ]) # XORG_MANPAGE_SECTIONS +# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION]) +# ------------------------ +# Minimum version: 1.7.0 +# +# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent +# provided by xorg-sgml-doctools, if installed. +AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ +AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])]) +XORG_SGML_PATH= +PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])], + [XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`], + [m4_ifval([$1],[:], + [if test x"$cross_compiling" != x"yes" ; then + AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent], + [XORG_SGML_PATH=$prefix/share/sgml]) + fi]) + ]) + +# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing +# the path and the name of the doc stylesheet +if test "x$XORG_SGML_PATH" != "x" ; then + AC_MSG_RESULT([$XORG_SGML_PATH]) + STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11 + XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl +else + AC_MSG_RESULT([no]) +fi + +AC_SUBST(XORG_SGML_PATH) +AC_SUBST(STYLESHEET_SRCDIR) +AC_SUBST(XSL_STYLESHEET) +AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"]) +]) # XORG_CHECK_SGML_DOCTOOLS + # XORG_CHECK_LINUXDOC # ------------------- # Minimum version: 1.0.0 @@ -7826,23 +7875,14 @@ AC_SUBST([ADMIN_MAN_DIR]) # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL "BUILD_LINUXDOC" AC_DEFUN([XORG_CHECK_LINUXDOC],[ -if test x$XORG_SGML_PATH = x ; then - XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= - -if test x"$cross_compiling" = x"yes" ; then - HAVE_DEFS_ENT=no -else - AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -fi +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) +AC_REQUIRE([XORG_WITH_PS2PDF]) AC_PATH_PROG(LINUXDOC, linuxdoc) -AC_PATH_PROG(PS2PDF, ps2pdf) -AC_MSG_CHECKING([Whether to build documentation]) +AC_MSG_CHECKING([whether to build documentation]) -if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then +if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -7852,9 +7892,9 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) AC_MSG_RESULT([$BUILDDOC]) -AC_MSG_CHECKING([Whether to build pdf documentation]) +AC_MSG_CHECKING([whether to build pdf documentation]) -if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then +if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes else BUILDPDFDOC=no @@ -7864,7 +7904,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f" MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" MAKE_PDF="$PS2PDF" MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" @@ -7884,48 +7924,44 @@ AC_SUBST(MAKE_HTML) # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -if test x$XORG_SGML_PATH = x ; then - XORG_SGML_PATH=$prefix/share/sgml -fi -HAVE_DEFS_ENT= +AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) + BUILDTXTDOC=no BUILDPDFDOC=no BUILDPSDOC=no BUILDHTMLDOC=no -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - AC_PATH_PROG(DOCBOOKPS, docbook2ps) AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) -AC_MSG_CHECKING([Whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && +AC_MSG_CHECKING([whether to build text documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKTXT != x && test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes fi AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) -AC_MSG_CHECKING([Whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && +AC_MSG_CHECKING([whether to build PDF documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKPDF != x && test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes fi AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) -AC_MSG_CHECKING([Whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && +AC_MSG_CHECKING([whether to build PostScript documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKPS != x && test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes fi AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) -AC_MSG_CHECKING([Whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && +AC_MSG_CHECKING([whether to build HTML documentation]) +if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x && test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes fi @@ -7943,6 +7979,548 @@ AC_SUBST(MAKE_PDF) AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK +# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT]) +# ---------------- +# Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-xmlto option, it allows maximum flexibilty in making decisions +# as whether or not to use the xmlto package. When DEFAULT is not specified, +# --with-xmlto assumes 'auto'. +# +# Interface to module: +# HAVE_XMLTO: used in makefiles to conditionally generate documentation +# XMLTO: returns the path of the xmlto program found +# returns the path set by the user in the environment +# --with-xmlto: 'yes' user instructs the module to use xmlto +# 'no' user instructs the module not to use xmlto +# +# Added in version 1.10.0 +# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation +# xmlto for text output requires either lynx, links, or w3m browsers +# +# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XMLTO],[ +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(xmlto, + AS_HELP_STRING([--with-xmlto], + [Use xmlto to regenerate documentation (default: ]_defopt[)]), + [use_xmlto=$withval], [use_xmlto=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_xmlto" = x"auto"; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_WARN([xmlto not found - documentation targets will be skipped]) + have_xmlto=no + else + have_xmlto=yes + fi +elif test "x$use_xmlto" = x"yes" ; then + AC_PATH_PROG([XMLTO], [xmlto]) + if test "x$XMLTO" = "x"; then + AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH]) + fi + have_xmlto=yes +elif test "x$use_xmlto" = x"no" ; then + if test "x$XMLTO" != "x"; then + AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified]) + fi + have_xmlto=no +else + AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no']) +fi + +# Test for a minimum version of xmlto, if provided. +m4_ifval([$1], +[if test "$have_xmlto" = yes; then + # scrape the xmlto version + AC_MSG_CHECKING([the xmlto version]) + xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$xmlto_version]) + AS_VERSION_COMPARE([$xmlto_version], [$1], + [if test "x$use_xmlto" = xauto; then + AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed]) + have_xmlto=no + else + AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed]) + fi]) +fi]) + +# Test for the ability of xmlto to generate a text target +have_xmlto_text=no +cat > conftest.xml << "EOF" +EOF +AS_IF([test "$have_xmlto" = yes], + [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) +rm -f conftest.xml +AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) +AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) +]) # XORG_WITH_XMLTO + +# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) +# ---------------- +# Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# as whether or not to use the asciidoc package. When DEFAULT is not specified, +# --with-asciidoc assumes 'auto'. +# +# Interface to module: +# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation +# ASCIIDOC: returns the path of the asciidoc program found +# returns the path set by the user in the environment +# --with-asciidoc: 'yes' user instructs the module to use asciidoc +# 'no' user instructs the module not to use asciidoc +# +# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_ASCIIDOC],[ +AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(asciidoc, + AS_HELP_STRING([--with-asciidoc], + [Use asciidoc to regenerate documentation (default: ]_defopt[)]), + [use_asciidoc=$withval], [use_asciidoc=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_asciidoc" = x"auto"; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_WARN([asciidoc not found - documentation targets will be skipped]) + have_asciidoc=no + else + have_asciidoc=yes + fi +elif test "x$use_asciidoc" = x"yes" ; then + AC_PATH_PROG([ASCIIDOC], [asciidoc]) + if test "x$ASCIIDOC" = "x"; then + AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH]) + fi + have_asciidoc=yes +elif test "x$use_asciidoc" = x"no" ; then + if test "x$ASCIIDOC" != "x"; then + AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified]) + fi + have_asciidoc=no +else + AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no']) +fi +m4_ifval([$1], +[if test "$have_asciidoc" = yes; then + # scrape the asciidoc version + AC_MSG_CHECKING([the asciidoc version]) + asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2` + AC_MSG_RESULT([$asciidoc_version]) + AS_VERSION_COMPARE([$asciidoc_version], [$1], + [if test "x$use_asciidoc" = xauto; then + AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed]) + have_asciidoc=no + else + AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed]) + fi]) +fi]) +AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) +]) # XORG_WITH_ASCIIDOC + +# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT]) +# -------------------------------- +# Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-doxygen option, it allows maximum flexibilty in making decisions +# as whether or not to use the doxygen package. When DEFAULT is not specified, +# --with-doxygen assumes 'auto'. +# +# Interface to module: +# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation +# DOXYGEN: returns the path of the doxygen program found +# returns the path set by the user in the environment +# --with-doxygen: 'yes' user instructs the module to use doxygen +# 'no' user instructs the module not to use doxygen +# +# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_DOXYGEN],[ +AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(doxygen, + AS_HELP_STRING([--with-doxygen], + [Use doxygen to regenerate documentation (default: ]_defopt[)]), + [use_doxygen=$withval], [use_doxygen=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_doxygen" = x"auto"; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_WARN([doxygen not found - documentation targets will be skipped]) + have_doxygen=no + else + have_doxygen=yes + fi +elif test "x$use_doxygen" = x"yes" ; then + AC_PATH_PROG([DOXYGEN], [doxygen]) + if test "x$DOXYGEN" = "x"; then + AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH]) + fi + have_doxygen=yes +elif test "x$use_doxygen" = x"no" ; then + if test "x$DOXYGEN" != "x"; then + AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified]) + fi + have_doxygen=no +else + AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no']) +fi +m4_ifval([$1], +[if test "$have_doxygen" = yes; then + # scrape the doxygen version + AC_MSG_CHECKING([the doxygen version]) + doxygen_version=`$DOXYGEN --version 2>/dev/null` + AC_MSG_RESULT([$doxygen_version]) + AS_VERSION_COMPARE([$doxygen_version], [$1], + [if test "x$use_doxygen" = xauto; then + AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed]) + have_doxygen=no + else + AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed]) + fi]) +fi]) +AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) +]) # XORG_WITH_DOXYGEN + +# XORG_WITH_GROFF([DEFAULT]) +# ---------------- +# Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-groff option, it allows maximum flexibilty in making decisions +# as whether or not to use the groff package. When DEFAULT is not specified, +# --with-groff assumes 'auto'. +# +# Interface to module: +# HAVE_GROFF: used in makefiles to conditionally generate documentation +# HAVE_GROFF_MM: the memorandum macros (-mm) package +# HAVE_GROFF_MS: the -ms macros package +# GROFF: returns the path of the groff program found +# returns the path set by the user in the environment +# --with-groff: 'yes' user instructs the module to use groff +# 'no' user instructs the module not to use groff +# +# Added in version 1.9.0: +# HAVE_GROFF_HTML: groff has dependencies to output HTML format: +# pnmcut pnmcrop pnmtopng pnmtops from the netpbm package. +# psselect from the psutils package. +# the ghostcript package. Refer to the grohtml man pages +# +# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path. +# +# OS and distros often splits groff in a basic and full package, the former +# having the groff program and the later having devices, fonts and macros +# Checking for the groff executable is not enough. +# +# If macros are missing, we cannot assume that groff is useless, so we don't +# unset HAVE_GROFF or GROFF env variables. +# HAVE_GROFF_?? can never be true while HAVE_GROFF is false. +# +AC_DEFUN([XORG_WITH_GROFF],[ +AC_ARG_VAR([GROFF], [Path to groff command]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_WITH(groff, + AS_HELP_STRING([--with-groff], + [Use groff to regenerate documentation (default: ]_defopt[)]), + [use_groff=$withval], [use_groff=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_groff" = x"auto"; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_WARN([groff not found - documentation targets will be skipped]) + have_groff=no + else + have_groff=yes + fi +elif test "x$use_groff" = x"yes" ; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH]) + fi + have_groff=yes +elif test "x$use_groff" = x"no" ; then + if test "x$GROFF" != "x"; then + AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified]) + fi + have_groff=no +else + AC_MSG_ERROR([--with-groff expects 'yes' or 'no']) +fi + +# We have groff, test for the presence of the macro packages +if test "x$have_groff" = x"yes"; then + AC_MSG_CHECKING([for ${GROFF} -ms macros]) + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + fi + AC_MSG_RESULT([$groff_ms_works]) + AC_MSG_CHECKING([for ${GROFF} -mm macros]) + if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then + groff_mm_works=yes + else + groff_mm_works=no + fi + AC_MSG_RESULT([$groff_mm_works]) +fi + +# We have groff, test for HTML dependencies, one command per package +if test "x$have_groff" = x"yes"; then + AC_PATH_PROGS(GS_PATH, [gs gswin32c]) + AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng]) + AC_PATH_PROG(PSSELECT_PATH, [psselect]) + if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then + have_groff_html=yes + else + have_groff_html=no + AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages]) + fi +fi + +# Set Automake conditionals for Makefiles +AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) +]) # XORG_WITH_GROFF + +# XORG_WITH_FOP([DEFAULT]) +# ---------------- +# Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-fop option, it allows maximum flexibilty in making decisions +# as whether or not to use the fop package. When DEFAULT is not specified, +# --with-fop assumes 'auto'. +# +# Interface to module: +# HAVE_FOP: used in makefiles to conditionally generate documentation +# FOP: returns the path of the fop program found +# returns the path set by the user in the environment +# --with-fop: 'yes' user instructs the module to use fop +# 'no' user instructs the module not to use fop +# +# If the user sets the value of FOP, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_FOP],[ +AC_ARG_VAR([FOP], [Path to fop command]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_WITH(fop, + AS_HELP_STRING([--with-fop], + [Use fop to regenerate documentation (default: ]_defopt[)]), + [use_fop=$withval], [use_fop=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_fop" = x"auto"; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_WARN([fop not found - documentation targets will be skipped]) + have_fop=no + else + have_fop=yes + fi +elif test "x$use_fop" = x"yes" ; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH]) + fi + have_fop=yes +elif test "x$use_fop" = x"no" ; then + if test "x$FOP" != "x"; then + AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified]) + fi + have_fop=no +else + AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) +]) # XORG_WITH_FOP + +# XORG_WITH_PS2PDF([DEFAULT]) +# ---------------- +# Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a module to test for the +# presence of the tool and obtain it's path in separate variables. Coupled with +# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# as whether or not to use the ps2pdf package. When DEFAULT is not specified, +# --with-ps2pdf assumes 'auto'. +# +# Interface to module: +# HAVE_PS2PDF: used in makefiles to conditionally generate documentation +# PS2PDF: returns the path of the ps2pdf program found +# returns the path set by the user in the environment +# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf +# 'no' user instructs the module not to use ps2pdf +# +# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PS2PDF],[ +AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +m4_define([_defopt], m4_default([$1], [auto])) +AC_ARG_WITH(ps2pdf, + AS_HELP_STRING([--with-ps2pdf], + [Use ps2pdf to regenerate documentation (default: ]_defopt[)]), + [use_ps2pdf=$withval], [use_ps2pdf=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_ps2pdf" = x"auto"; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped]) + have_ps2pdf=no + else + have_ps2pdf=yes + fi +elif test "x$use_ps2pdf" = x"yes" ; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH]) + fi + have_ps2pdf=yes +elif test "x$use_ps2pdf" = x"no" ; then + if test "x$PS2PDF" != "x"; then + AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified]) + fi + have_ps2pdf=no +else + AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) +]) # XORG_WITH_PS2PDF + +# XORG_ENABLE_DOCS (enable_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a builder to skip all +# documentation targets except traditional man pages. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DOCS: used in makefiles to conditionally generate documentation +# --enable-docs: 'yes' user instructs the module to generate docs +# 'no' user instructs the module not to generate docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DOCS],[ +m4_define([default], m4_default([$1], [yes])) +AC_ARG_ENABLE(docs, + AS_HELP_STRING([--enable-docs], + [Enable building the documentation (default: ]default[)]), + [build_docs=$enableval], [build_docs=]default) +m4_undefine([default]) +AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) +AC_MSG_CHECKING([whether to build documentation]) +AC_MSG_RESULT([$build_docs]) +]) # XORG_ENABLE_DOCS + +# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all developer documentation. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs +# --enable-devel-docs: 'yes' user instructs the module to generate developer docs +# 'no' user instructs the module not to generate developer docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ +m4_define([devel_default], m4_default([$1], [yes])) +AC_ARG_ENABLE(devel-docs, + AS_HELP_STRING([--enable-devel-docs], + [Enable building the developer documentation (default: ]devel_default[)]), + [build_devel_docs=$enableval], [build_devel_docs=]devel_default) +m4_undefine([devel_default]) +AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) +AC_MSG_CHECKING([whether to build developer documentation]) +AC_MSG_RESULT([$build_devel_docs]) +]) # XORG_ENABLE_DEVEL_DOCS + +# XORG_ENABLE_SPECS (enable_specs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all functional specification targets. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_SPECS: used in makefiles to conditionally generate specs +# --enable-specs: 'yes' user instructs the module to generate specs +# 'no' user instructs the module not to generate specs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_SPECS],[ +m4_define([spec_default], m4_default([$1], [yes])) +AC_ARG_ENABLE(specs, + AS_HELP_STRING([--enable-specs], + [Enable building the specs (default: ]spec_default[)]), + [build_specs=$enableval], [build_specs=]spec_default) +m4_undefine([spec_default]) +AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) +AC_MSG_CHECKING([whether to build functional specifications]) +AC_MSG_RESULT([$build_specs]) +]) # XORG_ENABLE_SPECS + # XORG_CHECK_MALLOC_ZERO # ---------------------- # Minimum version: 1.0.0 @@ -7972,7 +8550,8 @@ main() { exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); }], [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no]) + [MALLOC_ZERO_RETURNS_NULL=no], + [MALLOC_ZERO_RETURNS_NULL=yes]) fi AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) @@ -7995,38 +8574,69 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS]) # ---------------- # Minimum version: 1.1.0 # -# Sets up flags for source checkers such as lint and sparse if --with-lint -# is specified. (Use --with-lint=sparse for sparse.) -# Sets $LINT to name of source checker passed with --with-lint (default: lint) -# Sets $LINT_FLAGS to flags to pass to source checker -# Sets LINT automake conditional if enabled (default: disabled) +# This macro enables the use of a tool that flags some suspicious and +# non-portable constructs (likely to be bugs) in C language source code. +# It will attempt to locate the tool and use appropriate options. +# There are various lint type tools on different platforms. +# +# Interface to module: +# LINT: returns the path to the tool found on the platform +# or the value set to LINT on the configure cmd line +# also an Automake conditional +# LINT_FLAGS: an Automake variable with appropriate flags +# +# --with-lint: 'yes' user instructs the module to use lint +# 'no' user instructs the module not to use lint (default) +# +# If the user sets the value of LINT, AC_PATH_PROG skips testing the path. +# If the user sets the value of LINT_FLAGS, they are used verbatim. # AC_DEFUN([XORG_WITH_LINT],[ -# Allow checking code with lint, sparse, etc. +AC_ARG_VAR([LINT], [Path to a lint-style command]) +AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command]) AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], [Use a lint-style source code checker (default: disabled)])], [use_lint=$withval], [use_lint=no]) -if test "x$use_lint" = "xyes" ; then - LINT="lint" + +# Obtain platform specific info like program name and options +# The lint program on FreeBSD and NetBSD is different from the one on Solaris +case $host_os in + *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*) + lint_name=splint + lint_options="-badflag" + ;; + *freebsd* | *netbsd*) + lint_name=lint + lint_options="-u -b" + ;; + *solaris*) + lint_name=lint + lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; +esac + +# Test for the presence of the program (either guessed by the code or spelled out by the user) +if test "x$use_lint" = x"yes" ; then + AC_PATH_PROG([LINT], [$lint_name]) + if test "x$LINT" = "x"; then + AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH]) + fi +elif test "x$use_lint" = x"no" ; then + if test "x$LINT" != "x"; then + AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified]) + fi else - LINT="$use_lint" + AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.]) fi -if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then - case $LINT in - lint|*/lint) - case $host_os in - solaris*) - LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; - esac - ;; - esac + +# User supplied flags override default flags +if test "x$LINT_FLAGS" != "x"; then + lint_options=$LINT_FLAGS fi -AC_SUBST(LINT) -AC_SUBST(LINT_FLAGS) -AM_CONDITIONAL(LINT, [test x$LINT != xno]) +AC_SUBST([LINT_FLAGS],[$lint_options]) +AM_CONDITIONAL(LINT, [test "x$LINT" != x]) ]) # XORG_WITH_LINT @@ -8036,28 +8646,29 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno]) # # Sets up flags for building lint libraries for checking programs that call # functions in the library. -# Disabled by default, enable with --enable-lint-library -# Sets: -# @LINTLIB@ - name of lint library file to make -# MAKE_LINT_LIB - automake conditional # +# Interface to module: +# LINTLIB - Automake variable with the name of lint library file to make +# MAKE_LINT_LIB - Automake conditional +# +# --enable-lint-library: - 'yes' user instructs the module to created a lint library +# - 'no' user instructs the module not to create a lint library (default) AC_DEFUN([XORG_LINT_LIBRARY],[ AC_REQUIRE([XORG_WITH_LINT]) -# Build lint "library" for more indepth checks of programs calling this library AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], [Create lint library (default: disabled)])], [make_lint_lib=$enableval], [make_lint_lib=no]) -if test "x$make_lint_lib" != "xno" ; then - if test "x$LINT" = "xno" ; then - AC_MSG_ERROR([Cannot make lint library without --with-lint]) - fi - if test "x$make_lint_lib" = "xyes" ; then - LINTLIB=llib-l$1.ln - else - LINTLIB=$make_lint_lib - fi + +if test "x$make_lint_lib" = x"yes" ; then + LINTLIB=llib-l$1.ln + if test "x$LINT" = "x"; then + AC_MSG_ERROR([Cannot make lint library without --with-lint]) + fi +elif test "x$make_lint_lib" != x"no" ; then + AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.]) fi + AC_SUBST(LINTLIB) AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) @@ -8070,11 +8681,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) # Defines CWARNFLAGS to enable C compiler warnings. # AC_DEFUN([XORG_CWARNFLAGS], [ -AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_CC_C99]) if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast" +-Wbad-function-cast -Wformat=2" case `$CC -dumpversion` in 3.4.* | 4.*) CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" @@ -8087,7 +8698,6 @@ else fi fi AC_SUBST(CWARNFLAGS) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ]) # XORG_CWARNFLAGS # XORG_STRICT_OPTION @@ -8096,7 +8706,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # # Add configure option to enable strict compilation AC_DEFUN([XORG_STRICT_OPTION], [ -AC_REQUIRE([AC_PROG_CC]) +# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 AC_REQUIRE([AC_PROG_CC_C99]) AC_REQUIRE([XORG_CWARNFLAGS]) @@ -8126,12 +8736,33 @@ AC_SUBST([CWARNFLAGS]) # Defines default options for X.Org modules. # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) XORG_CWARNFLAGS XORG_STRICT_OPTION XORG_RELEASE_VERSION XORG_CHANGELOG +XORG_INSTALL XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) ]) # XORG_DEFAULT_OPTIONS + +# XORG_INSTALL() +# ---------------- +# Minimum version: 1.4.0 +# +# Defines the variable INSTALL_CMD as the command to copy +# INSTALL from $prefix/share/util-macros. +# +AC_DEFUN([XORG_INSTALL], [ +AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ +mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +AC_SUBST([INSTALL_CMD]) +]) # XORG_INSTALL dnl Copyright 2005 Red Hat, Inc dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -8159,22 +8790,9 @@ dnl # XORG_RELEASE_VERSION # -------------------- -# Adds --with/without-release-string and changes the PACKAGE and -# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also -# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. +# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ - AC_ARG_WITH(release-version, - AS_HELP_STRING([--with-release-version=STRING], - [Use release version string in package name]), - [RELEASE_VERSION="$withval"], - [RELEASE_VERSION=""]) - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - AC_MSG_NOTICE([Building with package name set to $PACKAGE]) - fi AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d . -f 1`], [Major version of this package]) @@ -8201,14 +8819,13 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # Defines the variable CHANGELOG_CMD as the command to generate # ChangeLog from git. # -# Arrange that distcleancheck ignores ChangeLog left over by distclean. # AC_DEFUN([XORG_CHANGELOG], [ -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ -mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ echo 'git directory not found: installing possibly empty changelog.' >&2)" AC_SUBST([CHANGELOG_CMD]) -AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) ]) # XORG_CHANGELOG dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ @@ -8245,7 +8862,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[ # SVR4 hides these in libraries other than libc AC_SEARCH_LIBS(socket, [socket]) AC_SEARCH_LIBS(gethostbyname, [nsl]) - AC_HAVE_LIBRARY([ws2_32]) + if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then + AC_HAVE_LIBRARY([ws2_32]) + fi # Needs to come after above checks for libsocket & libnsl for SVR4 systems AC_ARG_ENABLE(ipv6, diff --git a/lib/libXmu/configure b/lib/libXmu/configure index 43a8a3c9f..3869e26b3 100644 --- a/lib/libXmu/configure +++ b/lib/libXmu/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for libXmu 1.0.5. +# Generated by GNU Autoconf 2.62 for libXmu 1.1.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -572,6 +572,66 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_awk_strverscmp=' + # Use only awk features that work with 7th edition Unix awk (1978). + # My, what an old awk you have, Mr. Solaris! + END { + while (length(v1) && length(v2)) { + # Set d1 to be the next thing to compare from v1, and likewise for d2. + # Normally this is a single character, but if v1 and v2 contain digits, + # compare them as integers and fractions as strverscmp does. + if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) { + # Split v1 and v2 into their leading digit string components d1 and d2, + # and advance v1 and v2 past the leading digit strings. + for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue + for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue + d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1) + d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1) + if (d1 ~ /^0/) { + if (d2 ~ /^0/) { + # Compare two fractions. + while (d1 ~ /^0/ && d2 ~ /^0/) { + d1 = substr(d1, 2); len1-- + d2 = substr(d2, 2); len2-- + } + if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) { + # The two components differ in length, and the common prefix + # contains only leading zeros. Consider the longer to be less. + d1 = -len1 + d2 = -len2 + } else { + # Otherwise, compare as strings. + d1 = "x" d1 + d2 = "x" d2 + } + } else { + # A fraction is less than an integer. + exit 1 + } + } else { + if (d2 ~ /^0/) { + # An integer is greater than a fraction. + exit 2 + } else { + # Compare two integers. + d1 += 0 + d2 += 0 + } + } + } else { + # The normal case, without worrying about digits. + d1 = substr(v1, 1, 1); v1 = substr(v1, 2) + d2 = substr(v2, 1, 1); v2 = substr(v2, 2) + } + if (d1 < d2) exit 1 + if (d1 > d2) exit 2 + } + # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10), + # which mishandles some comparisons of empty strings to integers. + if (length(v2)) exit 1 + if (length(v1)) exit 2 + } +' # Check that we are running under the correct shell. @@ -750,8 +810,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libXmu' PACKAGE_TARNAME='libXmu' -PACKAGE_VERSION='1.0.5' -PACKAGE_STRING='libXmu 1.0.5' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='libXmu 1.1.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -852,14 +912,6 @@ am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os CC CFLAGS LDFLAGS @@ -876,16 +928,58 @@ AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE -SED +CPP GREP EGREP +CWARNFLAGS +CHANGELOG_CMD +PKG_CONFIG +INSTALL_CMD +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +SED +APP_MAN_SUFFIX +LIB_MAN_SUFFIX +FILE_MAN_SUFFIX +MISC_MAN_SUFFIX +DRIVER_MAN_SUFFIX +ADMIN_MAN_SUFFIX +APP_MAN_DIR +LIB_MAN_DIR +FILE_MAN_DIR +MISC_MAN_DIR +DRIVER_MAN_DIR +ADMIN_MAN_DIR +XORG_MAN_PAGE +MAN_SUBSTS +AM_DEFAULT_VERBOSITY +ENABLE_DOCS_TRUE +ENABLE_DOCS_FALSE +XMLTO +HAVE_XMLTO_TEXT_TRUE +HAVE_XMLTO_TEXT_FALSE +HAVE_XMLTO_TRUE +HAVE_XMLTO_FALSE +FOP +HAVE_FOP_TRUE +HAVE_FOP_FALSE +XORG_SGML_PATH +STYLESHEET_SRCDIR +XSL_STYLESHEET +HAVE_STYLESHEETS_TRUE +HAVE_STYLESHEETS_FALSE LN_S ECHO AR RANLIB DSYMUTIL NMEDIT -CPP CXX CXXFLAGS ac_ct_CXX @@ -897,22 +991,6 @@ F77 FFLAGS ac_ct_F77 LIBTOOL -CWARNFLAGS -CHANGELOG_CMD -distcleancheck_listfiles -APP_MAN_SUFFIX -LIB_MAN_SUFFIX -FILE_MAN_SUFFIX -MISC_MAN_SUFFIX -DRIVER_MAN_SUFFIX -ADMIN_MAN_SUFFIX -APP_MAN_DIR -LIB_MAN_DIR -FILE_MAN_DIR -MISC_MAN_DIR -DRIVER_MAN_DIR -ADMIN_MAN_DIR -PKG_CONFIG XMU_CFLAGS XMU_LIBS XMUU_CFLAGS @@ -932,16 +1010,18 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_maintainer_mode +enable_dependency_tracking +enable_strict_compilation +enable_docs +with_xmlto +with_fop enable_shared enable_static enable_fast_install -enable_dependency_tracking with_gnu_ld enable_libtool_lock with_pic with_tags -enable_strict_compilation -with_release_version enable_unix_transport enable_tcp_transport enable_ipv6 @@ -958,17 +1038,21 @@ LDFLAGS LIBS CPPFLAGS CPP +PKG_CONFIG +XMLTO +FOP CXX CXXFLAGS CCC CXXCPP F77 FFLAGS -PKG_CONFIG XMU_CFLAGS XMU_LIBS XMUU_CFLAGS -XMUU_LIBS' +XMUU_LIBS +LINT +LINT_FLAGS' # Initialize some variables set by options. @@ -1521,7 +1605,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXmu 1.0.5 to adapt to many kinds of systems. +\`configure' configures libXmu 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1591,7 +1675,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXmu 1.0.5:";; + short | recursive ) echo "Configuration of libXmu 1.1.0:";; esac cat <<\_ACEOF @@ -1601,16 +1685,17 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --disable-libtool-lock avoid locking (might break parallel builds) --enable-strict-compilation Enable all warnings from compiler and make them errors (default: disabled) + --enable-docs Enable building the documentation (yes: yes) + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) --enable-unix-transport Enable UNIX domain socket transport --enable-tcp-transport Enable TCP socket transport --enable-ipv6 Enable IPv6 support @@ -1621,12 +1706,13 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xmlto Use xmlto to regenerate documentation (default: + auto) + --with-fop Use fop to regenerate documentation (default: auto) --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] --with-tags[=TAGS] include additional configurations [automatic] - --with-release-version=STRING - Use release version string in package name --with-lint Use a lint-style source code checker (default: disabled) @@ -1639,16 +1725,20 @@ Some influential environment variables: CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor + PKG_CONFIG path to pkg-config utility + XMLTO Path to xmlto command + FOP Path to fop command CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - PKG_CONFIG path to pkg-config utility XMU_CFLAGS C compiler flags for XMU, overriding pkg-config XMU_LIBS linker flags for XMU, overriding pkg-config XMUU_CFLAGS C compiler flags for XMUU, overriding pkg-config XMUU_LIBS linker flags for XMUU, overriding pkg-config + LINT Path to a lint-style command + LINT_FLAGS Flags for the lint-style command Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1716,7 +1806,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXmu configure 1.0.5 +libXmu configure 1.1.0 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1730,7 +1820,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXmu $as_me 1.0.5, which was +It was created by libXmu $as_me 1.1.0, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2381,7 +2471,7 @@ fi # Define the identity of the package. PACKAGE='libXmu' - VERSION='1.0.5' + VERSION='1.1.0' cat >>confdefs.h <<_ACEOF @@ -2553,7 +2643,7 @@ fi -# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT +# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS @@ -2565,166 +2655,6 @@ fi -ac_config_headers="$ac_config_headers config.h" - - - -# Checks for programs. -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3830,64 +3760,443 @@ else fi -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${lt_cv_path_SED+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if test "${ac_cv_prog_cc_c99+set}" = set; then $as_echo_n "(cached) " >&6 else - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c99=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -SED=$lt_cv_path_SED + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: result: $SED" >&5 -$as_echo "$SED" >&6; } { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } @@ -4023,6 +4332,1401 @@ $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <float.h> + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <string.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdlib.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ctype.h> +#include <stdlib.h> +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test `eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi + +fi +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +$as_echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +$as_echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + $as_unset ac_script || ac_script= + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + + + + + +if test "x$GCC" = xyes ; then + CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ +-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ +-Wbad-function-cast -Wformat=2" + case `$CC -dumpversion` in + 3.4.* | 4.*) + CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" + ;; + esac +else + { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 +$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } +if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __SUNPRO_C + (void) __SUNPRO_C; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___SUNPRO_C=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___SUNPRO_C=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 +$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } +if test $ac_cv_have_decl___SUNPRO_C = yes; then + SUNCC="yes" +else + SUNCC="no" +fi + + if test "x$SUNCC" = "xyes"; then + CWARNFLAGS="-v" + fi +fi + + + +# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 + + + +# Check whether --enable-strict-compilation was given. +if test "${enable_strict_compilation+set}" = set; then + enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval +else + STRICT_COMPILE=no +fi + +if test "x$STRICT_COMPILE" = "xyes"; then + { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 +$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } +if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __SUNPRO_C + (void) __SUNPRO_C; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___SUNPRO_C=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___SUNPRO_C=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 +$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } +if test $ac_cv_have_decl___SUNPRO_C = yes; then + SUNCC="yes" +else + SUNCC="no" +fi + + { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 +$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } +if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __INTEL_COMPILER + (void) __INTEL_COMPILER; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___INTEL_COMPILER=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___INTEL_COMPILER=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 +$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } +if test $ac_cv_have_decl___INTEL_COMPILER = yes; then + INTELCC="yes" +else + INTELCC="no" +fi + + if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" + elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" + fi +fi +CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" + + + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + + +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ +echo 'git directory not found: installing possibly empty changelog.' >&2)" + + + + +macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` +INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ +mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ +echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" + + + + + + +if test x$APP_MAN_SUFFIX = x ; then + APP_MAN_SUFFIX=1 +fi +if test x$APP_MAN_DIR = x ; then + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' +fi + +if test x$LIB_MAN_SUFFIX = x ; then + LIB_MAN_SUFFIX=3 +fi +if test x$LIB_MAN_DIR = x ; then + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' +fi + +if test x$FILE_MAN_SUFFIX = x ; then + case $host_os in + solaris*) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; + esac +fi +if test x$FILE_MAN_DIR = x ; then + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' +fi + +if test x$MISC_MAN_SUFFIX = x ; then + case $host_os in + solaris*) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; + esac +fi +if test x$MISC_MAN_DIR = x ; then + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' +fi + +if test x$DRIVER_MAN_SUFFIX = x ; then + case $host_os in + solaris*) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; + esac +fi +if test x$DRIVER_MAN_DIR = x ; then + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' +fi + +if test x$ADMIN_MAN_SUFFIX = x ; then + case $host_os in + solaris*) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; + esac +fi +if test x$ADMIN_MAN_DIR = x ; then + ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' +fi + + + + + + + + + + + + + + + +XORG_MAN_PAGE="X Version 11" + +MAN_SUBSTS="\ + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__apploaddir__|\$(appdefaultdir)|g' \ + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" + + + +AM_DEFAULT_VERBOSITY=1 + + + + +# Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then + enableval=$enable_docs; build_docs=$enableval +else + build_docs=yes +fi + + + + +if test x$build_docs = xyes; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' +else + ENABLE_DOCS_TRUE='#' + ENABLE_DOCS_FALSE= +fi + +{ $as_echo "$as_me:$LINENO: checking whether to build documentation" >&5 +$as_echo_n "checking whether to build documentation... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $build_docs" >&5 +$as_echo "$build_docs" >&6; } + + + + + +# Check whether --with-xmlto was given. +if test "${with_xmlto+set}" = set; then + withval=$with_xmlto; use_xmlto=$withval +else + use_xmlto=auto +fi + + + +if test "x$use_xmlto" = x"auto"; then + # Extract the first word of "xmlto", so it can be a program name with args. +set dummy xmlto; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XMLTO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $XMLTO in + [\\/]* | ?:[\\/]*) + ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +XMLTO=$ac_cv_path_XMLTO +if test -n "$XMLTO"; then + { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5 +$as_echo "$XMLTO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$XMLTO" = "x"; then + { $as_echo "$as_me:$LINENO: WARNING: xmlto not found - documentation targets will be skipped" >&5 +$as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;} + have_xmlto=no + else + have_xmlto=yes + fi +elif test "x$use_xmlto" = x"yes" ; then + # Extract the first word of "xmlto", so it can be a program name with args. +set dummy xmlto; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XMLTO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $XMLTO in + [\\/]* | ?:[\\/]*) + ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +XMLTO=$ac_cv_path_XMLTO +if test -n "$XMLTO"; then + { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5 +$as_echo "$XMLTO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$XMLTO" = "x"; then + { { $as_echo "$as_me:$LINENO: error: --with-xmlto=yes specified but xmlto not found in PATH" >&5 +$as_echo "$as_me: error: --with-xmlto=yes specified but xmlto not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + have_xmlto=yes +elif test "x$use_xmlto" = x"no" ; then + if test "x$XMLTO" != "x"; then + { $as_echo "$as_me:$LINENO: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5 +$as_echo "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;} + fi + have_xmlto=no +else + { { $as_echo "$as_me:$LINENO: error: --with-xmlto expects 'yes' or 'no'" >&5 +$as_echo "$as_me: error: --with-xmlto expects 'yes' or 'no'" >&2;} + { (exit 1); exit 1; }; } +fi + +# Test for a minimum version of xmlto, if provided. +if test "$have_xmlto" = yes; then + # scrape the xmlto version + { $as_echo "$as_me:$LINENO: checking the xmlto version" >&5 +$as_echo_n "checking the xmlto version... " >&6; } + xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3` + { $as_echo "$as_me:$LINENO: result: $xmlto_version" >&5 +$as_echo "$xmlto_version" >&6; } + as_arg_v1=$xmlto_version +as_arg_v2=0.0.20 +awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null +case $? in +1) if test "x$use_xmlto" = xauto; then + { $as_echo "$as_me:$LINENO: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&5 +$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;} + have_xmlto=no + else + { { $as_echo "$as_me:$LINENO: error: xmlto version $xmlto_version found, but 0.0.20 needed" >&5 +$as_echo "$as_me: error: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;} + { (exit 1); exit 1; }; } + fi;; +0) ;; +2) ;; +esac +fi + +# Test for the ability of xmlto to generate a text target +have_xmlto_text=no +cat > conftest.xml << "EOF" +EOF +if test "$have_xmlto" = yes; then + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then + have_xmlto_text=yes +else + { $as_echo "$as_me:$LINENO: WARNING: xmlto cannot generate text format, this format skipped" >&5 +$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} +fi + +fi + +rm -f conftest.xml + + +if test $have_xmlto_text = yes; then + HAVE_XMLTO_TEXT_TRUE= + HAVE_XMLTO_TEXT_FALSE='#' +else + HAVE_XMLTO_TEXT_TRUE='#' + HAVE_XMLTO_TEXT_FALSE= +fi + + + +if test "$have_xmlto" = yes; then + HAVE_XMLTO_TRUE= + HAVE_XMLTO_FALSE='#' +else + HAVE_XMLTO_TRUE='#' + HAVE_XMLTO_FALSE= +fi + + + + + + +# Check whether --with-fop was given. +if test "${with_fop+set}" = set; then + withval=$with_fop; use_fop=$withval +else + use_fop=auto +fi + + + +if test "x$use_fop" = x"auto"; then + # Extract the first word of "fop", so it can be a program name with args. +set dummy fop; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FOP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $FOP in + [\\/]* | ?:[\\/]*) + ac_cv_path_FOP="$FOP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +FOP=$ac_cv_path_FOP +if test -n "$FOP"; then + { $as_echo "$as_me:$LINENO: result: $FOP" >&5 +$as_echo "$FOP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$FOP" = "x"; then + { $as_echo "$as_me:$LINENO: WARNING: fop not found - documentation targets will be skipped" >&5 +$as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;} + have_fop=no + else + have_fop=yes + fi +elif test "x$use_fop" = x"yes" ; then + # Extract the first word of "fop", so it can be a program name with args. +set dummy fop; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_FOP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $FOP in + [\\/]* | ?:[\\/]*) + ac_cv_path_FOP="$FOP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +FOP=$ac_cv_path_FOP +if test -n "$FOP"; then + { $as_echo "$as_me:$LINENO: result: $FOP" >&5 +$as_echo "$FOP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$FOP" = "x"; then + { { $as_echo "$as_me:$LINENO: error: --with-fop=yes specified but fop not found in PATH" >&5 +$as_echo "$as_me: error: --with-fop=yes specified but fop not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + have_fop=yes +elif test "x$use_fop" = x"no" ; then + if test "x$FOP" != "x"; then + { $as_echo "$as_me:$LINENO: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5 +$as_echo "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;} + fi + have_fop=no +else + { { $as_echo "$as_me:$LINENO: error: --with-fop expects 'yes' or 'no'" >&5 +$as_echo "$as_me: error: --with-fop expects 'yes' or 'no'" >&2;} + { (exit 1); exit 1; }; } +fi + + +if test "$have_fop" = yes; then + HAVE_FOP_TRUE= + HAVE_FOP_FALSE='#' +else + HAVE_FOP_TRUE='#' + HAVE_FOP_FALSE= +fi + + + +{ $as_echo "$as_me:$LINENO: checking for X.Org SGML entities >= 1.5" >&5 +$as_echo_n "checking for X.Org SGML entities >= 1.5... " >&6; } +XORG_SGML_PATH= +if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.5\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools` +else + : + +fi + +# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing +# the path and the name of the doc stylesheet +if test "x$XORG_SGML_PATH" != "x" ; then + { $as_echo "$as_me:$LINENO: result: $XORG_SGML_PATH" >&5 +$as_echo "$XORG_SGML_PATH" >&6; } + STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11 + XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + + +if test "x$XSL_STYLESHEET" != "x"; then + HAVE_STYLESHEETS_TRUE= + HAVE_STYLESHEETS_FALSE='#' +else + HAVE_STYLESHEETS_TRUE='#' + HAVE_STYLESHEETS_FALSE= +fi + + + +ac_config_headers="$ac_config_headers config.h" + + + +# Checks for programs. +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=yes +fi + + +# Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi + + +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${lt_cv_path_SED+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done + +fi + +SED=$lt_cv_path_SED + +{ $as_echo "$as_me:$LINENO: result: $SED" >&5 +$as_echo "$SED" >&6; } + # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then @@ -4423,7 +6127,6 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} # Allow CC to be a program name with arguments. compiler=$CC - # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then enableval=$enable_libtool_lock; @@ -4455,7 +6158,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4458 "configure"' > conftest.$ac_ext + echo '#line 6161 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4649,491 +6352,6 @@ esac need_locks="$enable_libtool_lock" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if test `eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - for ac_header in dlfcn.h do @@ -7563,11 +8781,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7566: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8784: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7570: \$? = $ac_status" >&5 + echo "$as_me:8788: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7853,11 +9071,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7856: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9074: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7860: \$? = $ac_status" >&5 + echo "$as_me:9078: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7957,11 +9175,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7960: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9178: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7964: \$? = $ac_status" >&5 + echo "$as_me:9182: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10357,7 +11575,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10360 "configure" +#line 11578 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10457,7 +11675,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10460 "configure" +#line 11678 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12866,11 +14084,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12869: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14087: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12873: \$? = $ac_status" >&5 + echo "$as_me:14091: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12970,11 +14188,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12973: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14191: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12977: \$? = $ac_status" >&5 + echo "$as_me:14195: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14553,11 +15771,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14556: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15774: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14560: \$? = $ac_status" >&5 + echo "$as_me:15778: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14657,11 +15875,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14660: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15878: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14664: \$? = $ac_status" >&5 + echo "$as_me:15882: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16872,11 +18090,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16875: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18093: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16879: \$? = $ac_status" >&5 + echo "$as_me:18097: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17162,11 +18380,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17165: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18383: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17169: \$? = $ac_status" >&5 + echo "$as_me:18387: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17266,11 +18484,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17269: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18487: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17273: \$? = $ac_status" >&5 + echo "$as_me:18491: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19951,1469 +21169,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - - { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if test "${ac_cv_prog_cc_c99+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdlib.h> -#include <wchar.h> -#include <stdio.h> - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} - -int -main () -{ - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - - ; - return 0; -} -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c99=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac - - - - - - -if test "x$GCC" = xyes ; then - CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ --Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast" - case `$CC -dumpversion` in - 3.4.* | 4.*) - CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" - ;; - esac -else - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl___SUNPRO_C=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl___SUNPRO_C=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test $ac_cv_have_decl___SUNPRO_C = yes; then - SUNCC="yes" -else - SUNCC="no" -fi - - if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" - fi -fi - - - - - - - - -# Check whether --enable-strict-compilation was given. -if test "${enable_strict_compilation+set}" = set; then - enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -else - STRICT_COMPILE=no -fi - -if test "x$STRICT_COMPILE" = "xyes"; then - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl___SUNPRO_C=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl___SUNPRO_C=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test $ac_cv_have_decl___SUNPRO_C = yes; then - SUNCC="yes" -else - SUNCC="no" -fi - - { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 -$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } -if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __INTEL_COMPILER - (void) __INTEL_COMPILER; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl___INTEL_COMPILER=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl___INTEL_COMPILER=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 -$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } -if test $ac_cv_have_decl___INTEL_COMPILER = yes; then - INTELCC="yes" -else - INTELCC="no" -fi - - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" - fi -fi -CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" - - - - -# Check whether --with-release-version was given. -if test "${with_release_version+set}" = set; then - withval=$with_release_version; RELEASE_VERSION="$withval" -else - RELEASE_VERSION="" -fi - - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 -$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} - fi - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` -_ACEOF - - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` - if test "x$PVM" = "x"; then - PVM="0" - fi - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MINOR $PVM -_ACEOF - - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` - if test "x$PVP" = "x"; then - PVP="0" - fi - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_PATCHLEVEL $PVP -_ACEOF - - - -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ -mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" - -distcleancheck_listfiles='find . -type f ! -name ChangeLog -print' - - - - - -if test x$APP_MAN_SUFFIX = x ; then - APP_MAN_SUFFIX=1 -fi -if test x$APP_MAN_DIR = x ; then - APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -fi - -if test x$LIB_MAN_SUFFIX = x ; then - LIB_MAN_SUFFIX=3 -fi -if test x$LIB_MAN_DIR = x ; then - LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -fi - -if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; - esac -fi -if test x$FILE_MAN_DIR = x ; then - FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -fi - -if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac -fi -if test x$MISC_MAN_DIR = x ; then - MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -fi - -if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; - esac -fi -if test x$DRIVER_MAN_DIR = x ; then - DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -fi - -if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; - esac -fi -if test x$ADMIN_MAN_DIR = x ; then - ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -fi - - - - - - - - - - - - - - - - # Checks for pkg-config packages - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi - -fi - pkg_failed=no { $as_echo "$as_me:$LINENO: checking for XMU" >&5 $as_echo_n "checking for XMU... " >&6; } @@ -21525,9 +21283,6 @@ $as_echo "yes" >&6; } : fi - - - pkg_failed=no { $as_echo "$as_me:$LINENO: checking for XMUU" >&5 $as_echo_n "checking for XMUU... " >&6; } @@ -21639,8 +21394,6 @@ $as_echo "yes" >&6; } : fi - - # CvtStdSel.c needs to know which network transports to build hostname # conversion routines for { $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 @@ -21919,6 +21672,7 @@ if test "$ac_res" != no; then fi + if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then { $as_echo "$as_me:$LINENO: checking for main in -lws2_32" >&5 $as_echo_n "checking for main in -lws2_32... " >&6; } @@ -21989,6 +21743,7 @@ _ACEOF fi ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main + fi # Needs to come after above checks for libsocket & libnsl for SVR4 systems # Check whether --enable-ipv6 was given. @@ -22376,7 +22131,8 @@ _ACEOF -# Allow checking code with lint, sparse, etc. + + # Check whether --with-lint was given. if test "${with_lint+set}" = set; then @@ -22385,28 +22141,92 @@ else use_lint=no fi -if test "x$use_lint" = "xyes" ; then - LINT="lint" + +# Obtain platform specific info like program name and options +# The lint program on FreeBSD and NetBSD is different from the one on Solaris +case $host_os in + *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*) + lint_name=splint + lint_options="-badflag" + ;; + *freebsd* | *netbsd*) + lint_name=lint + lint_options="-u -b" + ;; + *solaris*) + lint_name=lint + lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; +esac + +# Test for the presence of the program (either guessed by the code or spelled out by the user) +if test "x$use_lint" = x"yes" ; then + # Extract the first word of "$lint_name", so it can be a program name with args. +set dummy $lint_name; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_LINT+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $LINT in + [\\/]* | ?:[\\/]*) + ac_cv_path_LINT="$LINT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LINT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +LINT=$ac_cv_path_LINT +if test -n "$LINT"; then + { $as_echo "$as_me:$LINENO: result: $LINT" >&5 +$as_echo "$LINT" >&6; } else - LINT="$use_lint" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then - case $LINT in - lint|*/lint) - case $host_os in - solaris*) - LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; - esac - ;; - esac + + + if test "x$LINT" = "x"; then + { { $as_echo "$as_me:$LINENO: error: --with-lint=yes specified but lint-style tool not found in PATH" >&5 +$as_echo "$as_me: error: --with-lint=yes specified but lint-style tool not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi +elif test "x$use_lint" = x"no" ; then + if test "x$LINT" != "x"; then + { $as_echo "$as_me:$LINENO: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5 +$as_echo "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;} + fi +else + { { $as_echo "$as_me:$LINENO: error: --with-lint expects 'yes' or 'no'. Use LINT variable to specify path." >&5 +$as_echo "$as_me: error: --with-lint expects 'yes' or 'no'. Use LINT variable to specify path." >&2;} + { (exit 1); exit 1; }; } fi +# User supplied flags override default flags +if test "x$LINT_FLAGS" != "x"; then + lint_options=$LINT_FLAGS +fi +LINT_FLAGS=$lint_options -if test x$LINT != xno; then +if test "x$LINT" != x; then LINT_TRUE= LINT_FALSE='#' else @@ -22418,7 +22238,6 @@ fi -# Build lint "library" for more indepth checks of programs calling this library # Check whether --enable-lint-library was given. if test "${enable_lint_library+set}" = set; then enableval=$enable_lint_library; make_lint_lib=$enableval @@ -22426,21 +22245,23 @@ else make_lint_lib=no fi -if test "x$make_lint_lib" != "xno" ; then - if test "x$LINT" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: Cannot make lint library without --with-lint" >&5 + +if test "x$make_lint_lib" = x"yes" ; then + LINTLIB=llib-lXmu.ln + if test "x$LINT" = "x"; then + { { $as_echo "$as_me:$LINENO: error: Cannot make lint library without --with-lint" >&5 $as_echo "$as_me: error: Cannot make lint library without --with-lint" >&2;} { (exit 1); exit 1; }; } - fi - if test "x$make_lint_lib" = "xyes" ; then - LINTLIB=llib-lXmu.ln - else - LINTLIB=$make_lint_lib - fi + fi +elif test "x$make_lint_lib" != x"no" ; then + { { $as_echo "$as_me:$LINENO: error: --enable-lint-library expects 'yes' or 'no'." >&5 +$as_echo "$as_me: error: --enable-lint-library expects 'yes' or 'no'." >&2;} + { (exit 1); exit 1; }; } fi + if test x$make_lint_lib != xno; then MAKE_LINT_LIB_TRUE= MAKE_LINT_LIB_FALSE='#' @@ -22454,7 +22275,7 @@ fi LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/` -ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile xmu.pc xmuu.pc" +ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile src/Makefile xmu.pc xmuu.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22574,17 +22395,45 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +$as_echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +if test -z "${HAVE_XMLTO_TEXT_TRUE}" && test -z "${HAVE_XMLTO_TEXT_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO_TEXT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_XMLTO_TEXT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_XMLTO_TRUE}" && test -z "${HAVE_XMLTO_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"HAVE_XMLTO\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_FOP_TRUE}" && test -z "${HAVE_FOP_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_FOP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"HAVE_FOP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_STYLESHEETS_TRUE}" && test -z "${HAVE_STYLESHEETS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_STYLESHEETS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"HAVE_STYLESHEETS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -22924,7 +22773,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXmu $as_me 1.0.5, which was +This file was extended by libXmu $as_me 1.1.0, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22977,7 +22826,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libXmu config.status 1.0.5 +libXmu config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -23099,9 +22948,10 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "xmu.pc") CONFIG_FILES="$CONFIG_FILES xmu.pc" ;; diff --git a/lib/libXmu/configure.ac b/lib/libXmu/configure.ac index f521572e4..69ea57031 100644 --- a/lib/libXmu/configure.ac +++ b/lib/libXmu/configure.ac @@ -2,38 +2,38 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.57) +AC_PREREQ([2.60]) AC_INIT([libXmu], - 1.0.5, + [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXmu) + [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) +XORG_DEFAULT_OPTIONS +XORG_ENABLE_DOCS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) + AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_LIBTOOL -AC_PROG_CC -XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) -AC_SUBST(XMU_CFLAGS) -AC_SUBST(XMU_LIBS) - PKG_CHECK_MODULES(XMUU, x11) -AC_SUBST(XMUU_CFLAGS) -AC_SUBST(XMUU_LIBS) # CvtStdSel.c needs to know which network transports to build hostname # conversion routines for @@ -63,6 +63,7 @@ LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/` AC_SUBST(LINTLIBUU) AC_OUTPUT([Makefile + doc/Makefile include/Makefile src/Makefile xmu.pc diff --git a/lib/libXmu/doc/Makefile.am b/lib/libXmu/doc/Makefile.am new file mode 100644 index 000000000..3c1df531b --- /dev/null +++ b/lib/libXmu/doc/Makefile.am @@ -0,0 +1,62 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# 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: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# + +if ENABLE_DOCS +dist_doc_DATA = Xmu.xml xlogo.svg + +if HAVE_XMLTO +doc_DATA = Xmu.html + +if HAVE_FOP +doc_DATA += Xmu.pdf Xmu.ps +endif + +if HAVE_XMLTO_TEXT +doc_DATA += Xmu.txt +endif + +CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css + +if HAVE_STYLESHEETS +XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/ + +doc_DATA += xorg.css +xorg.css: $(STYLESHEET_SRCDIR)/xorg.css + $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ +endif + +XML_SOURCEFILES = $(srcdir)/Xmu.xml $(XSL_STYLESHEET) + +Xmu.txt: $(XML_SOURCEFILES) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $(srcdir)/Xmu.xml + +Xmu.html: $(XML_SOURCEFILES) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $(srcdir)/Xmu.xml + +Xmu.pdf: $(XML_SOURCEFILES) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $(srcdir)/Xmu.xml + +Xmu.ps: $(XML_SOURCEFILES) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $(srcdir)/Xmu.xml +endif HAVE_XMLTO +endif ENABLE_DOCS diff --git a/lib/libXmu/doc/Makefile.in b/lib/libXmu/doc/Makefile.in new file mode 100644 index 000000000..87c1de834 --- /dev/null +++ b/lib/libXmu/doc/Makefile.in @@ -0,0 +1,466 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# 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: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = Xmu.pdf Xmu.ps +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = Xmu.txt +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = xorg.css +subdir = doc +DIST_COMMON = $(am__dist_doc_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +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) +mkinstalldirs = $(SHELL) $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__dist_doc_DATA_DIST = Xmu.xml xlogo.svg +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)" +dist_docDATA_INSTALL = $(INSTALL_DATA) +docDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_doc_DATA) $(doc_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +HAS_SNPRINTF = @HAS_SNPRINTF@ +HAVE_FOP_FALSE = @HAVE_FOP_FALSE@ +HAVE_FOP_TRUE = @HAVE_FOP_TRUE@ +HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@ +HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@ +HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ +HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ +HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ +HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINT = @LINT@ +LINTLIB = @LINTLIB@ +LINTLIBUU = @LINTLIBUU@ +LINT_FALSE = @LINT_FALSE@ +LINT_FLAGS = @LINT_FLAGS@ +LINT_TRUE = @LINT_TRUE@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@ +MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XMUU_CFLAGS = @XMUU_CFLAGS@ +XMUU_LIBS = @XMUU_LIBS@ +XMU_CFLAGS = @XMU_CFLAGS@ +XMU_LIBS = @XMU_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +@ENABLE_DOCS_TRUE@dist_doc_DATA = Xmu.xml xlogo.svg +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@doc_DATA = Xmu.html $(am__append_1) \ +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) \ +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_3) +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@XML_SOURCEFILES = $(srcdir)/Xmu.xml $(XSL_STYLESHEET) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-dist_docDATA: $(dist_doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + @list='$(dist_doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + +uninstall-dist_docDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-dist_docDATA install-docDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_docDATA uninstall-docDATA \ + uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_docDATA \ + install-docDATA install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_docDATA uninstall-docDATA uninstall-info-am + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@xorg.css: $(STYLESHEET_SRCDIR)/xorg.css +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ + +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.txt: $(XML_SOURCEFILES) +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $(srcdir)/Xmu.xml + +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.html: $(XML_SOURCEFILES) +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $(srcdir)/Xmu.xml + +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.pdf: $(XML_SOURCEFILES) +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $(srcdir)/Xmu.xml + +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@Xmu.ps: $(XML_SOURCEFILES) +@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $(srcdir)/Xmu.xml +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/lib/libXmu/doc/Xmu.xml b/lib/libXmu/doc/Xmu.xml new file mode 100644 index 000000000..bd79d6efc --- /dev/null +++ b/lib/libXmu/doc/Xmu.xml @@ -0,0 +1,4727 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> +<!-- lifted from troff+ms+XMan by doclifter --> + +<article id='xmu'> + <articleinfo> + <title>Xmu and Xmuu Library API Reference</title> + <abstract><para>“Don't ask.”</para></abstract> + + <legalnotice> + + <para> +Copyright © 1989 X Consortium + </para> + <para> +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: + </para> + <para> +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + </para> + <para> +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. + </para> + <para> +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. + </para> + <para> +<trademark><emphasis>X Window System</emphasis></trademark> +is a trademark of The Open Group. + </para> + + </legalnotice> + </articleinfo> + + <sect1 id='introduction'> + <title>Introduction</title> + + <para> +The Xmu Library is a collection of miscellaneous (some might say random) +utility functions that have been useful in building various applications +and widgets. This library is required by the Athena Widgets. + </para> + + <para> +Starting in XFree86 4.1.0, and incorporated into X11R6.7 and later releases, +a subset of the functions that do not rely on the Athena Widgets (libXaw) +or X Toolkit Instrinsics (libXt) are provided in a second library, libXmuu. + </para> + + <para> +Programs using either of these libraries are encouraged to determine the +correct compiler and linker options via the <userinput>xmu</userinput> or +<userinput>xmuu</userinput> module names for <command>pkg-config</command>, +<indexterm> +<primary><command>pkg-config</command></primary> +</indexterm> +such as: + + <screen> +cc -c xapplication.c `pkg-config --cflags xmu` +cc -o xapplication xapplication.o `pkg-config --libs xmu` + </screen> + </para> + + </sect1> + + <sect1 id='atom_functions'> + <title>Atom Functions</title> + + <para> +To use the functions and macros defined in this section, you should include +the header file +<<filename class='headerfile'>X11/Xmu/Atoms.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Atoms.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <funcsynopsis> + <funcprototype> + <funcdef><function>XA_ATOM_PAIR</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_CHARACTER_POSITION</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_CLASS</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_CLIENT_WINDOW</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_CLIPBOARD</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_COMPOUND_TEXT</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_DECNET_ADDRESS</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_DELETE</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_FILENAME</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_HOSTNAME</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_IP_ADDRESS</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_LENGTH</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_LIST_LENGTH</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_NAME</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_NET_ADDRESS</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_NULL</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_OWNER_OS</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_SPAN</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_TARGETS</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_TEXT</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_TIMESTAMP</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_USER</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + <funcprototype> + <funcdef><function>XA_UTF8_STRING</function></funcdef> + <paramdef><parameter>d</parameter></paramdef> + </funcprototype> + </funcsynopsis> + + <para> + <indexterm> + <primary><type>Atom</type></primary> + </indexterm> +These macros take a display as argument and return an +<type>Atom</type>. +The name of the +atom is obtained from the macro name by removing the leading characters +“<code>XA_</code>”. The +<type>Atom</type> +value is cached, such that subsequent requests do not cause +another round-trip to the server. + </para> + + <para id="XmuMakeAtom"> + <indexterm zone="XmuMakeAtom"> + <primary><function>XmuMakeAtom</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>AtomPtr <function>XmuMakeAtom</function></funcdef> + <paramdef>const char *<parameter>name</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>name</parameter></term> + <listitem><para> +specifies the atom name + </para></listitem> + </varlistentry> + </variablelist> + +This function creates and initializes an opaque object, an +<type>AtomPtr</type>, +for an +<type>Atom</type> +with the +given name. +<function>XmuInternAtom</function> +can be used to cache the Atom value for one or more displays. + </para> + + <para id="XmuNameOfAtom"> + <indexterm zone="XmuNameOfAtom"> + <primary><function>XmuNameOfAtom</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>char *<function>XmuNameOfAtom</function></funcdef> + <paramdef>AtomPtr <parameter>atom_ptr</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>atom_ptr</parameter></term> + <listitem><para> +specifies the AtomPtr + </para></listitem> + </varlistentry> + </variablelist> + +The function returns the name of an AtomPtr. + </para> + + <para id="XmuInternAtom"> + <indexterm zone="XmuInternAtom"> + <primary><function>XmuInternAtom</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Atom <function>XmuInternAtom</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>AtomPtr <parameter>atom_ptr</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>atom_ptr</parameter></term> + <listitem><para> +specifies the AtomPtr + </para></listitem> + </varlistentry> + </variablelist> + +This function returns the +<type>Atom</type> +for an +<type>AtomPtr</type>. +The +<type>Atom</type> +is cached, +such that subsequent requests do not cause another round-trip to the server. + </para> + + <para id="XmuGetAtomName"> + <indexterm zone="XmuGetAtomName"> + <primary><function>XmuGetAtomName</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>char *<function>XmuGetAtomName</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Atom <parameter>atom</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>atom</parameter></term> + <listitem><para> +specifies the atom whose name is desired + </para></listitem> + </varlistentry> + </variablelist> + +This function returns the name of an +<type>Atom</type>. +The result is cached, such that subsequent +requests do not cause another round-trip to the server. + </para> + + <para id="XmuInternStrings"> + <indexterm zone="XmuInternStrings"> + <primary><function>XmuInternStrings</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuInternStrings</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>String *<parameter>names</parameter></paramdef> + <paramdef>Cardinal <parameter>count</parameter></paramdef> + <paramdef>Atom *<parameter>atoms</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>names</parameter></term> + <listitem><para> +specifies the strings to intern + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>count</parameter></term> + <listitem><para> +specifies the number of strings + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>atoms</parameter></term> + <listitem><para> +returns the list of Atom values + </para></listitem> + </varlistentry> + </variablelist> + +This function converts a list of atom names into +<type>Atom</type> +values. The results are cached, such +that subsequent requests do not cause further round-trips to the server. +The caller is responsible for preallocating the array pointed at by atoms. + </para> + + </sect1> + + <sect1 id='error_handler_functions'> + <title>Error Handler Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/Error.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Error.h</filename></primary> +</indexterm> +and link against the libXmu or libXmuu library. + </para> + + <para id="XmuPrintDefaultErrorMessage"> + <indexterm zone="XmuPrintDefaultErrorMessage"> + <primary><function>XmuPrintDefaultErrorMessage</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuPrintDefaultErrorMessage</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XErrorEvent *<parameter>event</parameter></paramdef> + <paramdef>FILE *<parameter>fp</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the error + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fp</parameter></term> + <listitem><para> + specifies where to print the error message + </para></listitem> + </varlistentry> + </variablelist> + +This function prints an error message, equivalent to Xlib's default error +message for protocol errors. It returns a non-zero value +if the caller should consider exiting, otherwise it returns 0. +This function can be used when you need to +write your own error handler, but need to print out an error from within +that handler. + </para> + + <para id="XmuSimpleErrorHandler"> + <indexterm zone="XmuSimpleErrorHandler"> + <primary><function>XmuSimpleErrorHandler</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuSimpleErrorHandler</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XErrorEvent *<parameter>errorp</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>errorp</parameter></term> + <listitem><para> +specifies the error + </para></listitem> + </varlistentry> + </variablelist> + +This function ignores errors for +<errorname>BadWindow</errorname> +errors for +<function>XQueryTree</function> +and +<function>XGetWindowAttributes</function>, +and ignores +<errorname>BadDrawable</errorname> +errors for +<function>XGetGeometry</function>; +it returns 0 in those cases. Otherwise, it prints the default error message, +and returns a non-zero value if the caller should consider exiting, +and 0 if the caller should not exit. + </para> + </sect1> + + <sect1 id='system_utility_functions'> + <title>System Utility Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/SysUtil.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/SysUtil.h</filename></primary> +</indexterm> +and link against the libXmu or libXmuu library. + </para> + + <para id="XmuGetHostname"> + <indexterm zone="XmuGetHostname"> + <primary><function>XmuGetHostname</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuGetHostname</function></funcdef> + <paramdef>char *<parameter>buf</parameter></paramdef> + <paramdef>int <parameter>maxlen</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>buf</parameter></term> + <listitem><para> +returns the host name + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>maxlen</parameter></term> + <listitem><para> +specifies the length of <parameter>buf</parameter> + </para></listitem> + </varlistentry> + </variablelist> + +This function stores the null terminated name of the local host in +<parameter>buf</parameter>, and +returns length of the name. This function hides operating system differences, +such as whether to call <function>gethostname</function> or +<function>uname</function>. + </para> + + <para id="XmuSnprintf"> + <indexterm zone="XmuSnprintf"> + <primary><function>XmuSnprintf</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuSnprintf</function></funcdef> + <paramdef>char *<parameter>str</parameter></paramdef> + <paramdef>int <parameter>size</parameter></paramdef> + <paramdef><parameter>...</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>str</parameter></term> + <listitem><para> +string to write output to + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>size</parameter></term> + <listitem><para> +specifies the size of <parameter>str</parameter> + </para></listitem> + </varlistentry> + </variablelist> + +This function was provided as a portable implementation of +<function>snprintf</function> before all platforms could be +relied on to provide their own. It is now deprecated in favor of +calling <function>snprintf</function> directly and should only be used +in software that needs to continue to support non-Unix98 compliant platforms. + </para> + + + </sect1> + + <sect1 id='window_utility_functions'> + <title>Window Utility Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/WinUtil.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/WinUtil.h</filename></primary> +</indexterm>. +To use <function>XmuClientWindow</function>, you may link against either the +libXmu or libXmuu libraries. The other functions in this section require +linking against the libXmu library. + </para> + + <para id="XmuScreenOfWindow"> + <indexterm zone="XmuScreenOfWindow"> + <primary><function>XmuScreenOfWindow</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Screen *<function>XmuScreenOfWindow</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Window <parameter>w</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>w</parameter></term> + <listitem><para> +specifies the window + </para></listitem> + </varlistentry> + </variablelist> + +This function returns the +<type>Screen</type> +on which the specified window was created. + </para> + + <para id="XmuClientWindow"> + <indexterm zone="XmuClientWindow"> + <primary><function>XmuClientWindow</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Window <function>XmuClientWindow</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Window <parameter>win</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>win</parameter></term> + <listitem><para> +specifies the window + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuClientWindow"> + <primary><property>WM_STATE</property></primary> + </indexterm> +This function finds a window, at or below the specified window, which has a +<property>WM_STATE</property> property. If such a window is found, it is +returned, otherwise the +argument window is returned. + </para> + + <para id="XmuUpdateMapHints"> + <indexterm zone="XmuUpdateMapHints"> + <primary><function>XmuUpdateMapHints</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Bool <function>XmuUpdateMapHints</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Window <parameter>w</parameter></paramdef> + <paramdef>XSizeHints *<parameter>hints</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>win</parameter></term> + <listitem><para> +specifies the window + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>hints</parameter></term> + <listitem><para> +specifies the new hints, or <symbol>NULL</symbol> + </para></listitem> + </varlistentry> + </variablelist> + +This function clears the +<symbol>PPosition</symbol> +and +<symbol>PSize</symbol> +flags and sets the +<symbol>USPosition</symbol> +and +<symbol>USSize</symbol> +flags in the hints structure, and then stores the hints for the +window using + <indexterm zone="XmuUpdateMapHints"> + <primary><function>XSetWMNormalHints</function></primary> + </indexterm> +<function>XSetWMNormalHints</function> +and returns +<symbol>True</symbol>. +If <symbol>NULL</symbol> is passed for the +hints structure, then the current hints are read back from the window using + <indexterm zone="XmuUpdateMapHints"> + <primary><function>XGetWMNormalHints</function></primary> + </indexterm> +<function>XGetWMNormalHints</function> +and are used instead, and +<symbol>True</symbol> +is returned; otherwise +<symbol>False</symbol> +is returned. + </para> + + </sect1> + + <sect1 id='cursor_utility_functions'> + <title>Cursor Utility Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/CurUtil.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/CurUtil.h</filename></primary> +</indexterm> +and link against the libXmu or libXmuu library. + </para> + + <para id="XmuCursorNameToIndex"> + <indexterm zone="XmuCursorNameToIndex"> + <primary><function>XmuCursorNameToIndex</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuCursorNameToIndex</function></funcdef> + <paramdef>const char *<parameter>name</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>name</parameter></term> + <listitem><para> +specifies the name of the cursor + </para></listitem> + </varlistentry> + </variablelist> + +This function takes the name of a standard cursor and returns its index +in the standard cursor font. The cursor names are formed by removing the +“<code>XC_</code>” prefix from the cursor defines listed in +Appendix B of the Xlib +manual. + </para> + + </sect1> + + <sect1 id='graphics_functions'> + <title>Graphics Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/Drawing.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Drawing.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para id="XmuDrawRoundedRectangle"> + <indexterm zone="XmuDrawRoundedRectangle"> + <primary><function>XmuDrawRoundedRectangle</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuDrawRoundedRectangle</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Drawable <parameter>draw</parameter></paramdef> + <paramdef>GC <parameter>gc</parameter></paramdef> + <paramdef>int <parameter>x</parameter></paramdef> + <paramdef>int <parameter>y</parameter></paramdef> + <paramdef>int <parameter>w</parameter></paramdef> + <paramdef>int <parameter>h</parameter></paramdef> + <paramdef>int <parameter>ew</parameter></paramdef> + <paramdef>int <parameter>eh</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>draw</parameter></term> + <listitem><para> +specifies the drawable + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>gc</parameter></term> + <listitem><para> +specifies the GC + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>x</parameter></term> + <listitem><para> +specifies the upper left x coordinate + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>y</parameter></term> + <listitem><para> +specifies the upper left y coordinate + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>w</parameter></term> + <listitem><para> +specifies the rectangle width + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>h</parameter></term> + <listitem><para> +specifies the rectangle height + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>ew</parameter></term> + <listitem><para> +specifies the corner width + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>eh</parameter></term> + <listitem><para> +specifies the corner height + </para></listitem> + </varlistentry> + </variablelist> + +This function draws a rounded rectangle, where x, y, w, h are the dimensions +of the overall rectangle, and ew and eh are the sizes of a bounding box that +the corners are drawn inside of; ew should be no more than half of w, and eh +should be no more than half of h. The current GC line attributes control +all attributes of the line. + </para> + + <para id="XmuFillRoundedRectangle"> + <indexterm zone="XmuFillRoundedRectangle"> + <primary><function>XmuFillRoundedRectangle</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuFillRoundedRectangle</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Drawable <parameter>draw</parameter></paramdef> + <paramdef>GC <parameter>gc</parameter></paramdef> + <paramdef>int <parameter>x</parameter></paramdef> + <paramdef>int <parameter>y</parameter></paramdef> + <paramdef>int <parameter>w</parameter></paramdef> + <paramdef>int <parameter>h</parameter></paramdef> + <paramdef>int <parameter>ew</parameter></paramdef> + <paramdef>int <parameter>eh</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>draw</parameter></term> + <listitem><para> +specifies the drawable + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>gc</parameter></term> + <listitem><para> +specifies the GC + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>x</parameter></term> + <listitem><para> +specifies the upper left x coordinate + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>y</parameter></term> + <listitem><para> +specifies the upper left y coordinate + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>w</parameter></term> + <listitem><para> +specifies the rectangle width + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>h</parameter></term> + <listitem><para> +specifies the rectangle height + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>ew</parameter></term> + <listitem><para> +specifies the corner width + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>eh</parameter></term> + <listitem><para> +specifies the corner height + </para></listitem> + </varlistentry> + </variablelist> + +This function draws a filled rounded rectangle, where x, y, w, h are the +dimensions of the overall rectangle, and ew and eh are the sizes of a +bounding box that the corners are drawn inside of; ew should be no more than +half of w, and eh should be no more than half of h. The current GC fill +settings control all attributes of the fill contents. + </para> + + <para id="XmuDrawLogo"> + <indexterm zone="XmuDrawLogo"> + <primary><function>XmuDrawLogo</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef><function>XmuDrawLogo</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Drawable <parameter>drawable</parameter></paramdef> + <paramdef>GC <parameter>gcFore</parameter></paramdef> + <paramdef>GC <parameter>gcBack</parameter></paramdef> + <paramdef>int <parameter>x</parameter></paramdef> + <paramdef>int <parameter>y</parameter></paramdef> + <paramdef>unsigned int <parameter>width</parameter></paramdef> + <paramdef>unsigned int <parameter>height</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>drawable</parameter></term> + <listitem><para> +specifies the drawable + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>gcFore</parameter></term> + <listitem><para> +specifies the foreground GC + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>gcBack</parameter></term> + <listitem><para> +specifies the background GC + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>x</parameter></term> + <listitem><para> +specifies the upper left x coordinate + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>y</parameter></term> + <listitem><para> +specifies the upper left y coordinate + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>width</parameter></term> + <listitem><para> +specifies the logo width + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>height</parameter></term> + <listitem><para> +specifies the logo height + </para></listitem> + </varlistentry> + </variablelist> + + <figure id="xlogo" float="1" pgwide="0"> + <title>The X Logo</title> + <mediaobject> + <imageobject> + <imagedata id="xlogo-svg" format="SVG" fileref="xlogo.svg"/> + </imageobject> + </mediaobject> + </figure> + +This function draws the “official” X Window System logo +(<xref linkend="xlogo"/>). The bounding box +of the logo in the drawable is given by x, y, width, and height. The logo +itself is filled using gcFore, and the rest of the rectangle is filled using +gcBack. + </para> + + <para id="XmuCreateStippledPixmap"> + <indexterm zone="XmuCreateStippledPixmap"> + <primary><function>XmuCreateStippledPixmap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Pixmap <function>XmuCreateStippledPixmap</function></funcdef> + <paramdef>Screen *<parameter>screen</parameter></paramdef> + <paramdef>Pixel <parameter>fore</parameter></paramdef> + <paramdef>Pixel <parameter>back</parameter></paramdef> + <paramdef>unsigned int <parameter>depth</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen the pixmap is created on + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fore</parameter></term> + <listitem><para> +specifies the foreground pixel value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>back</parameter></term> + <listitem><para> +specifies the background pixel value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>depth</parameter></term> + <listitem><para> +specifies the depth of the pixmap + </para></listitem> + </varlistentry> + </variablelist> + +This function creates a two pixel by one pixel stippled pixmap of specified +depth on the specified screen. The pixmap is cached so that multiple +requests share the same pixmap. The pixmap should be freed with +<function>XmuReleaseStippledPixmap</function> +to maintain correct reference counts. + </para> + + <para id="XmuReleaseStippledPixmap"> + <indexterm zone="XmuReleaseStippledPixmap"> + <primary><function>XmuReleaseStippledPixmap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuReleaseStippledPixmap</function></funcdef> + <paramdef>Screen *<parameter>screen</parameter></paramdef> + <paramdef>Pixmap <parameter>pixmap</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen the pixmap was created on + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>pixmap</parameter></term> + <listitem><para> +specifies the pixmap to free + </para></listitem> + </varlistentry> + </variablelist> + +This function frees a pixmap created with +<function>XmuCreateStippledPixmap</function>. + </para> + + <para id="XmuReadBitmapData"> + <indexterm zone="XmuReadBitmapData"> + <primary><function>XmuReadBitmapData</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuReadBitmapData</function></funcdef> + <paramdef>FILE *<parameter>fstream</parameter></paramdef> + <paramdef>unsigned int *<parameter>width</parameter></paramdef> + <paramdef>unsigned int *<parameter>height</parameter></paramdef> + <paramdef>unsigned char **<parameter>datap</parameter></paramdef> + <paramdef>int *<parameter>x_hot</parameter></paramdef> + <paramdef>int *<parameter>y_hot</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>fstream</parameter></term> + <listitem><para> +specifies the stream to read from + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>width</parameter></term> + <listitem><para> +returns the width of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>height</parameter></term> + <listitem><para> +returns the height of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>datap</parameter></term> + <listitem><para> +returns the parsed bitmap data + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>x_hot</parameter></term> + <listitem><para> +returns the x coordinate of the hotspot + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>y_hot</parameter></term> + <listitem><para> +returns the y coordinate of the hotspot + </para></listitem> + </varlistentry> + </variablelist> + +This function reads a standard bitmap file description from the specified +stream, and returns the parsed data in a format suitable for passing to +<function>XCreateBitmapFromData</function>. +The return value of the function has the same +interpretation as the return value for +<function>XReadBitmapFile</function>. + </para> + + <para id="XmuReadBitmapDataFromFile"> + <indexterm zone="XmuReadBitmapDataFromFile"> + <primary><function>XmuReadBitmapDataFromFile</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuReadBitmapDataFromFile</function></funcdef> + <paramdef>const char *<parameter>filename</parameter></paramdef> + <paramdef>unsigned int *<parameter>width</parameter></paramdef> + <paramdef>unsigned int *<parameter>height</parameter></paramdef> + <paramdef>unsigned char **<parameter>datap</parameter></paramdef> + <paramdef>int *<parameter>x_hot</parameter></paramdef> + <paramdef>int *<parameter>y_hot</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>fstream</parameter></term> + <listitem><para> +specifies the file to read from + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>width</parameter></term> + <listitem><para> +returns the width of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>height</parameter></term> + <listitem><para> +returns the height of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>datap</parameter></term> + <listitem><para> +returns the parsed bitmap data + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>x_hot</parameter></term> + <listitem><para> +returns the x coordinate of the hotspot + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>y_hot</parameter></term> + <listitem><para> +returns the y coordinate of the hotspot + </para></listitem> + </varlistentry> + </variablelist> + +This function reads a standard bitmap file description from the specified +file, and returns the parsed data in a format suitable for passing to +<function>XCreateBitmapFromData</function>. +The return value of the function has the same +interpretation as the return value for +<function>XReadBitmapFile</function>. + </para> + + <para id="XmuLocateBitmapFile"> + <indexterm zone="XmuLocateBitmapFile"> + <primary><function>XmuLocateBitmapFile</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Pixmap <function>XmuLocateBitmapFile</function></funcdef> + <paramdef>Screen *<parameter>screen</parameter></paramdef> + <paramdef>const char *<parameter>name</parameter></paramdef> + <paramdef>char *<parameter>srcname</parameter></paramdef> + <paramdef>int <parameter>srcnamelen</parameter></paramdef> + <paramdef>int *<parameter>widthp</parameter></paramdef> + <paramdef>int *<parameter>heightp</parameter></paramdef> + <paramdef>int *<parameter>xhotp</parameter></paramdef> + <paramdef>int *<parameter>yhotp</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen the pixmap is created on + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>name</parameter></term> + <listitem><para> +specifies the file to read from + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>srcname</parameter></term> + <listitem><para> +returns the full filename of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>srcnamelen</parameter></term> + <listitem><para> +specifies the length of the srcname buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>width</parameter></term> + <listitem><para> +returns the width of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>height</parameter></term> + <listitem><para> +returns the height of the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>xhotp</parameter></term> + <listitem><para> +returns the x coordinate of the hotspot + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>yhotp</parameter></term> + <listitem><para> +returns the y coordinate of the hotspot + </para></listitem> + </varlistentry> + </variablelist> + +This function reads a file in standard bitmap file format, using +<function>XReadBitmapFile</function>, +and returns the created bitmap. The filename may be +absolute, or relative to the global resource named + <indexterm zone="XmuLocateBitmapFile"> + <primary><systemitem class="resource">bitmapFilePath</systemitem></primary> + </indexterm> +<systemitem class="resource">bitmapFilePath</systemitem> with class +BitmapFilePath. If the resource is not defined, the default value is the +build symbol BITMAPDIR, which is typically +"<filename class="directory">/usr/include/X11/bitmaps</filename>". +If <parameter>srcnamelen</parameter> is greater than zero and +<parameter>srcname</parameter> is not <symbol>NULL</symbol>, +the null terminated filename will be copied into +<parameter>srcname</parameter>. The size and hotspot of the bitmap are +also returned. + </para> + + <para id="XmuCreatePixmapFromBitmap"> + <indexterm zone="XmuCreatePixmapFromBitmap"> + <primary><function>XmuCreatePixmapFromBitmap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Pixmap <function>XmuCreatePixmapFromBitmap</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Drawable <parameter>d</parameter></paramdef> + <paramdef>Pixmap <parameter>bitmap</parameter></paramdef> + <paramdef>unsigned int <parameter>width</parameter></paramdef> + <paramdef>unsigned int <parameter>height</parameter></paramdef> + <paramdef>unsigned int <parameter>depth</parameter></paramdef> + <paramdef>unsigned long <parameter>fore</parameter></paramdef> + <paramdef>unsigned long <parameter>back</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen the pixmap is created on + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>bitmap</parameter></term> + <listitem><para> +specifies the bitmap source + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>width</parameter></term> + <listitem><para> +specifies the width of the pixmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>height</parameter></term> + <listitem><para> +specifies the height of the pixmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>depth</parameter></term> + <listitem><para> +specifies the depth of the pixmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fore</parameter></term> + <listitem><para> +specifies the foreground pixel value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>back</parameter></term> + <listitem><para> +specifies the background pixel value + </para></listitem> + </varlistentry> + </variablelist> + +This function creates a pixmap of the specified width, height, and depth, on +the same screen as the specified drawable, and then performs an +<function>XCopyPlane</function> +from the specified bitmap to the pixmap, +using the specified foreground and background pixel values. +The created pixmap is returned. + </para> + + </sect1> + + <sect1 id='selection_functions'> + <title>Selection Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/StdSel.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/StdSel.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para id="XmuConvertStandardSelection"> + <indexterm zone="XmuConvertStandardSelection"> + <primary><function>XmuConvertStandardSelection</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Boolean <function>XmuConvertStandardSelection</function></funcdef> + <paramdef>Widget <parameter>w</parameter></paramdef> + <paramdef>Time <parameter>time</parameter></paramdef> + <paramdef>Atom *<parameter>selection</parameter></paramdef> + <paramdef>Atom *<parameter>target</parameter></paramdef> + <paramdef>Atom *<parameter>type</parameter></paramdef> + <paramdef>XPointer <parameter>value</parameter></paramdef> + <paramdef>unsigned long *<parameter>length</parameter></paramdef> + <paramdef>int *<parameter>format</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>w</parameter></term> + <listitem><para> +specifies the widget which currently owns the selection + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>time</parameter></term> + <listitem><para> +specifies the time at which the selection was established + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>selection</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>target</parameter></term> + <listitem><para> +specifies the target type of the selection + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>type</parameter></term> + <listitem><para> +returns the property type of the converted value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>value</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>length</parameter></term> + <listitem><para> +returns the number of elements in the converted value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>format</parameter></term> + <listitem><para> +returns the size in bits of the elements</para> + </listitem> + </varlistentry> + </variablelist> + +This function converts the following standard selections: CLASS, +CLIENT_WINDOW, DECNET_ADDRESS, HOSTNAME, IP_ADDRESS, NAME, OWNER_OS, +TARGETS, TIMESTAMP, and USER. It returns +<symbol>True</symbol> +if the conversion was successful, else it returns +<symbol>False</symbol>. + </para> + </sect1> + + <sect1 id='type_converter_functions'> + <title>Type Converter Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/Converters.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Converters.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para id="XmuCvtFunctionToCallback"> + <indexterm zone="XmuCvtFunctionToCallback"> + <primary><function>XmuCvtFunctionToCallback</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtFunctionToCallback</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +the function to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +the place to store the converted value + </para></listitem> + </varlistentry> + </variablelist> + +This function converts a callback procedure to a callback list containing +that procedure, with <symbol>NULL</symbol> closure data. To use this converter, include the +following in your widget's ClassInitialize procedure: + + <programlisting> +XtAddConverter(XtRCallProc, XtRCallback, XmuCvtFunctionToCallback, NULL, 0); + </programlisting> + </para> + + <para id="XmuCvtStringToBackingStore"> + <indexterm zone="XmuCvtStringToBackingStore"> + <primary><function>XmuCvtStringToBackingStore</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToBackingStore</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument must be a pointer to a Cardinal containing the value 0 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToBackingStore"> + <primary>backing-store</primary> + </indexterm> +This function converts a string to a backing-store integer as defined in +<<filename class='headerfile'>X11/X.h</filename>>. +The string "notUseful" converts to +<symbol>NotUseful</symbol>, +"whenMapped" converts to +<symbol>WhenMapped</symbol>, +and "always" converts to +<symbol>Always</symbol>. +The string "default" converts to the value +<symbol>Always</symbol> + +<symbol>WhenMapped</symbol> + +<symbol>NotUseful</symbol>. +The case of the string does not matter. +To use this converter, include the following +in your widget's ClassInitialize procedure: + + <programlisting> +XtAddConverter(XtRString, XtRBackingStore, XmuCvtStringToBackingStore, NULL, 0); + </programlisting> + </para> + + <para id="XmuCvtStringToBitmap"> + <indexterm zone="XmuCvtStringToBitmap"> + <primary><function>XmuCvtStringToBitmap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToBitmap</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +the sole argument specifies the Screen on which to create the bitmap + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +must be the value 1 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToBitmap"> + <primary>window manager icons</primary> + </indexterm> +This function creates a bitmap (a Pixmap of depth one) suitable for window +manager icons. The string argument is the name of a file in standard bitmap +file format. For the possible filename specifications, see +<link linkend="XmuLocateBitmapFile"><function>XmuLocateBitmapFile</function></link>. +To use this converter, include the following in your widget's +ClassInitialize procedure: + + <programlisting> +static XtConvertArgRec screenConvertArg[] = { + {XtBaseOffset, (XtPointer)XtOffset(Widget, core.screen), sizeof(Screen *)} +}; + +XtAddConverter(XtRString, XtRBitmap, XmuCvtStringToBitmap, + screenConvertArg, XtNumber(screenConvertArg)); + </programlisting> + </para> + + <para id="XmuCvtStringToColorCursor"> + <indexterm zone="XmuCvtStringToColorCursor"> + <primary><function>XmuCvtStringToColorCursor</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Boolean <function>XmuCvtStringToColorCursor</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + <paramdef>XtPointer *<parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the display to use for conversion warnings + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +specifies the required conversion arguments + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +specifies the number of required conversion arguments, which is 4 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToColorCursor"> + <primary><type>Cursor</type></primary> + </indexterm> +This function converts a string to a +<type>Cursor</type> +with the foreground and background pixels specified by the conversion +arguments. The string can either be a +standard cursor name formed by removing the <code>“XC_”</code> +prefix from any of the +cursor defines listed in Appendix B of the Xlib Manual, a font name and +glyph index in decimal of the form "FONT fontname index [[font] index]", +or a bitmap filename acceptable to +<link linkend="XmuLocateBitmapFile"><function>XmuLocateBitmapFile</function></link>. +To use this converter, include +the following in the widget ClassInitialize procedure: + + <programlisting> +static XtConvertArgRec colorCursorConvertArgs[] = { + {XtWidgetBaseOffset, (XtPointer) XtOffsetOf(WidgetRec, core.screen), + sizeof(Screen *)}, + {XtResourceString, (XtPointer) XtNpointerColor, sizeof(Pixel)}, + {XtResourceString, (XtPointer) XtNpointerColorBackground, sizeof(Pixel)}, + {XtWidgetBaseOffset, (XtPointer) XtOffsetOf(WidgetRec, core.colormap), + sizeof(Colormap)} +}; + + +XtSetTypeConverter(XtRString, XtRColorCursor, XmuCvtStringToColorCursor, + colorCursorConvertArgs, XtNumber(colorCursorConvertArgs), + XtCacheByDisplay, NULL); + </programlisting> + +The widget must recognize XtNpointerColor and XtNpointerColorBackground as +resources, or specify other appropriate foreground and background resources. +The widget's Realize and SetValues methods must cause the converter to be +invoked with the appropriate arguments when one of the foreground, +background, or cursor resources has changed, or when the window is created, +and must assign the cursor to the window of the widget. + </para> + + <para id="XmuCvtStringToCursor"> + <indexterm zone="XmuCvtStringToCursor"> + <primary><function>XmuCvtStringToCursor</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToCursor</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +specifies the required conversion argument, the screen + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +specifies the number of required conversion arguments, which is 1 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToCursor"> + <primary><type>Cursor</type></primary> + </indexterm> +This function converts a string to a +<type>Cursor</type>. +The string can either be a +standard cursor name formed by removing the <code>“XC_”</code> +prefix from any of the +cursor defines listed in Appendix B of the Xlib Manual, a font name and +glyph index in decimal of the form "FONT fontname index [[font] index]", or +a bitmap filename acceptable to +<link linkend="XmuLocateBitmapFile"><function>XmuLocateBitmapFile</function></link>. +To use this converter, include +the following in your widget's ClassInitialize procedure: + + <programlisting> +static XtConvertArgRec screenConvertArg[] = { + {XtBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen), sizeof(Screen *)} +}; + +XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor, + screenConvertArg, XtNumber(screenConvertArg)); + </programlisting> + </para> + + <para id="XmuCvtStringToGravity"> + <indexterm zone="XmuCvtStringToGravity"> + <primary><function>XmuCvtStringToGravity</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToGravity</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument must be a pointer to a Cardinal containing the value 0 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToGravity"> + <primary><type>XtGravity</type></primary> + </indexterm> +This function converts a string to an +<type>XtGravity</type> +enumeration value. The string "forget" and a <symbol>NULL</symbol> value convert to +<symbol>ForgetGravity</symbol>, +"NorthWestGravity" converts to +<symbol>NorthWestGravity</symbol>, +the strings "NorthGravity" and "top" convert to +<symbol>NorthGravity</symbol>, +"NorthEastGravity" converts to +<symbol>NorthEastGravity</symbol>, +the strings "West" and "left" convert to +<symbol>WestGravity</symbol>, +"CenterGravity" converts to +<symbol>CenterGravity</symbol>, +"EastGravity" and "right" convert to +<symbol>EastGravity</symbol>, +"SouthWestGravity" converts to +<symbol>SouthWestGravity</symbol>, +"SouthGravity" and "bottom" convert to +<symbol>SouthGravity</symbol>, +"SouthEastGravity" converts to +<symbol>SouthEastGravity</symbol>, +"StaticGravity" converts to +<symbol>StaticGravity</symbol>, +and "UnmapGravity" converts to +<symbol>UnmapGravity</symbol>. +The case of the string does not matter. To use this converter, include +the following in your widget's class initialize procedure: + + <programlisting> +XtAddConverter(XtRString, XtRGravity, XmuCvtStringToGravity, NULL, 0); + </programlisting> + </para> + + <para id="XmuCvtStringToJustify"> + <indexterm zone="XmuCvtStringToJustify"> + <primary><function>XmuCvtStringToJustify</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToJustify</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToJustify"> + <primary><type>XtJustify</type></primary> + </indexterm> +This function converts a string to an +<type>XtJustify</type> +enumeration value. The string "left" converts to +<symbol>XtJustifyLeft</symbol>, +"center" converts to +<symbol>XtJustifyCenter</symbol>, +and "right" converts to +<symbol>XtJustifyRight</symbol>. +The case of the string does not matter. To use this converter, +include the following in your widget's ClassInitialize procedure: + + <programlisting> +XtAddConverter(XtRString, XtRJustify, XmuCvtStringToJustify, NULL, 0); + </programlisting> + </para> + + <para id="XmuCvtStringToLong"> + <indexterm zone="XmuCvtStringToLong"> + <primary><function>XmuCvtStringToLong</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToLong</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument must be a pointer to a Cardinal containing 0 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + +This function converts a string to an integer of type long. It parses the +string using +<function>sscanf</function> +with a format of "%ld". To use this converter, include +the following in your widget's ClassInitialize procedure: + + <programlisting> +XtAddConverter(XtRString, XtRLong, XmuCvtStringToLong, NULL, 0); + </programlisting> + </para> + + <para id="XmuCvtStringToOrientation"> + <indexterm zone="XmuCvtStringToOrientation"> + <primary><function>XmuCvtStringToOrientation</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToOrientation</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuCvtStringToOrientation"> + <primary><type>XtOrientation</type></primary> + </indexterm> +This function converts a string to an +<type>XtOrientation</type> +enumeration value. The string "horizontal" converts to +<symbol>XtorientHorizontal</symbol> +and "vertical" converts to +<symbol>XtorientVertical</symbol>. +The case of the string does not matter. To use this converter, +include the following in your widget's ClassInitialize procedure: + + <programlisting> +XtAddConverter(XtRString, XtROrientation, XmuCvtStringToOrientation, NULL, 0); + </programlisting> + </para> + + <para id="XmuCvtStringToShapeStyle"> + <indexterm zone="XmuCvtStringToShapeStyle"> + <primary><function>XmuCvtStringToShapeStyle</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Boolean <function>XmuCvtStringToShapeStyle</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + <paramdef>XtPointer *<parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +the display to use for conversion warnings + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +the value to convert from + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +the place to store the converted value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + </variablelist> + +This function converts a string to an integer shape style. The string +"rectangle" converts to +<symbol>XmuShapeRectangle</symbol>, +"oval" converts to +<symbol>XmuShapeOval</symbol>, +"ellipse" converts to +<symbol>XmuShapeEllipse</symbol>, +and "roundedRectangle" converts to +<symbol>XmuShapeRoundedRectangle</symbol>. +The case of the string does not matter. To use this converter, +include the following in your widget's ClassInitialize procedure: + + <programlisting> +XtSetTypeConverter(XtRString, XtRShapeStyle, XmuCvtStringToShapeStyle, + NULL, 0, XtCacheNone, NULL); + </programlisting> + </para> + + <para id="XmuReshapeWidget"> + <indexterm zone="XmuReshapeWidget"> + <primary><function>XmuReshapeWidget</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Boolean <function>XmuReshapeWidget</function></funcdef> + <paramdef>Widget <parameter>w</parameter></paramdef> + <paramdef>int <parameter>shape_style</parameter></paramdef> + <paramdef>int <parameter>corner_width</parameter></paramdef> + <paramdef>int <parameter>corner_height</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>w</parameter></term> + <listitem><para> +specifies the widget to reshape + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>shape_style</parameter></term> + <listitem><para> +specifies the new shape + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>corner_width</parameter></term> + <listitem><para> +specifies the width of the rounded rectangle corner + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>corner_height</parameter></term> + <listitem><para> +specified the height of the rounded rectangle corner + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm zone="XmuReshapeWidget"> + <primary>Shape extension</primary> + </indexterm> +This function reshapes the specified widget, using the Shape extension, to a +rectangle, oval, ellipse, or rounded rectangle, as specified by shape_style +( +<symbol>XmuShapeRectangle</symbol>, +<symbol>XmuShapeOval</symbol>, +<symbol>XmuShapeEllipse</symbol>, +and +<symbol>XmuShapeRoundedRectangle</symbol>, +respectively). +The shape is bounded by the outside edges of the rectangular extents of the +widget. If the shape is a rounded rectangle, corner_width and corner_height +specify the size of the bounding box that the corners are drawn inside of +(see +<link linkend="XmuFillRoundedRectangle"><function>XmuFillRoundedRectangle</function></link>); +otherwise, corner_width and corner_height are ignored. +The origin of the widget within its parent remains unchanged. + </para> + + <para id="XmuCvtStringToWidget"> + <indexterm zone="XmuCvtStringToWidget"> + <primary><function>XmuCvtStringToWidget</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCvtStringToWidget</function></funcdef> + <paramdef>XrmValue *<parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +the sole argument is the parent Widget + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument must be 1 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + </variablelist> + +This function converts a string to an immediate child widget of the parent +widget passed as an argument. Note that this converter only works for +child widgets that have already been created; there is no lazy evaluation. +The string is first compared against the +names of the normal and popup children, and if a match is found the +corresponding child is returned. If no match is found, the string is +compared against the classes of the normal and popup children, and if a +match is found the corresponding child is returned. The case of the string +is significant. To use this converter, include the following in your +widget's ClassInitialize procedure: + + <programlisting> +static XtConvertArgRec parentCvtArg[] = { + {XtBaseOffset, (XtPointer)XtOffset(Widget, core.parent), sizeof(Widget)}, +}; + +XtAddConverter(XtRString, XtRWidget, XmuCvtStringToWidget, + parentCvtArg, XtNumber(parentCvtArg)); + </programlisting> + </para> + + <para id="XmuNewCvtStringToWidget"> + <indexterm zone="XmuNewCvtStringToWidget"> + <primary><function>XmuNewCvtStringToWidget</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Boolean <function>XmuNewCvtStringToWidget</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>args</parameter></paramdef> + <paramdef>Cardinal *<parameter>num_args</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>fromVal</parameter></paramdef> + <paramdef>XrmValuePtr <parameter>toVal</parameter></paramdef> + <paramdef>XtPointer *<parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +the display to use for conversion warnings + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>args</parameter></term> + <listitem><para> +the sole argument is the parent Widget + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_args</parameter></term> + <listitem><para> +this argument must be a pointer to a Cardinal containing the value 1 + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>fromVal</parameter></term> + <listitem><para> +specifies the string to convert + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toVal</parameter></term> + <listitem><para> +returns the converted value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +this argument is ignored + </para></listitem> + </varlistentry> + </variablelist> + +This converter is identical in functionality to +<link linkend="XmuCvtStringToWidget"><function>XmuCvtStringToWidget</function></link>, except +that it is a new-style converter, allowing the specification of a cache type +at the time of registration. +Most widgets will not cache the conversion results, as the application may +dynamically create and destroy widgets, which would cause cached values to +become illegal. To use this converter, include the following in the widget's +class initialize procedure: + + <programlisting> +static XtConvertArgRec parentCvtArg[] = { + {XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.parent), + sizeof(Widget)} +}; + +XtSetTypeConverter(XtRString, XtRWidget, XmuNewCvtStringToWidget, + parentCvtArg, XtNumber(parentCvtArg), XtCacheNone, NULL); + </programlisting> + + </para> + + </sect1> + + <sect1 id='character_set_functions'> + <title>Character Set Functions</title> + +<para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/CharSet.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/CharSet.h</filename></primary> +</indexterm> +and link against the libXmu or libXmuu library. +</para> + + <warning><para> +The functions in this section are <emphasis remap='B'>deprecated</emphasis> +because they don't work in most locales now supported by X11; most platforms +provide alternatives in their system libraries. + </para></warning> + + <para id="XmuCopyISOLatin1Lowered"> + <indexterm zone="XmuCopyISOLatin1Lowered"> + <primary><function>XmuCopyISOLatin1Lowered</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCopyISOLatin1Lowered</function></funcdef> + <paramdef>char *<parameter>dst</parameter></paramdef> + <paramdef>const char *<parameter>src</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dst</parameter></term> + <listitem><para> +returns the string copy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>src</parameter></term> + <listitem><para> +specifies the string to copy + </para></listitem> + </varlistentry> + </variablelist> + +This function copies a null terminated string from src to dst (including the +null), changing all Latin-1 uppercase letters to lowercase. The string is +assumed to be encoded using ISO 8859-1. + </para> + + <para> +Note that like <function>strcpy</function> the caller is responsible for +ensuring the size of <parameter>dst</parameter> is at least as large as the +size of <parameter>src</parameter>. + </para> + + <para id="XmuNCopyISOLatin1Lowered"> + <indexterm zone="XmuNCopyISOLatin1Lowered"> + <primary><function>XmuNCopyISOLatin1Lowered</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuNCopyISOLatin1Lowered</function></funcdef> + <paramdef>char *<parameter>dst</parameter></paramdef> + <paramdef>const char *<parameter>src</parameter></paramdef> + <paramdef>int <parameter>size</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dst</parameter></term> + <listitem><para> +returns the string copy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>src</parameter></term> + <listitem><para> +specifies the string to copy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>size</parameter></term> + <listitem><para> +maximum number of characters (including the null terminator) to write to dst + </para></listitem> + </varlistentry> + </variablelist> + +This function copies up to <code><parameter>size</parameter> - 1</code> +characters of a null terminated string from <parameter>src</parameter> +to <parameter>dst</parameter>, and terminates it with a null, +changing all Latin-1 uppercase letters to lowercase. The string is +assumed to be encoded using ISO 8859-1. + </para> + + <para id="XmuCopyISOLatin1Uppered"> + <indexterm zone="XmuCopyISOLatin1Uppered"> + <primary><function>XmuCopyISOLatin1Uppered</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCopyISOLatin1Uppered</function></funcdef> + <paramdef>char *<parameter>dst</parameter></paramdef> + <paramdef>const char *<parameter>src</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dst</parameter></term> + <listitem><para> +returns the string copy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>src</parameter></term> + <listitem><para> +specifies the string to copy + </para></listitem> + </varlistentry> + </variablelist> + +This function copies a null terminated string from src to dst (including the +null), changing all Latin-1 lowercase letters to uppercase. The string is +assumed to be encoded using ISO 8859-1. + </para> + + <para> +Note that like <function>strcpy</function> the caller is responsible for +ensuring the size of <parameter>dst</parameter> is at least as large as the +size of <parameter>src</parameter>. + </para> + + <para id="XmuNCopyISOLatin1Uppered"> + <indexterm zone="XmuNCopyISOLatin1Uppered"> + <primary><function>XmuNCopyISOLatin1Uppered</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuNCopyISOLatin1Uppered</function></funcdef> + <paramdef>char *<parameter>dst</parameter></paramdef> + <paramdef>const char *<parameter>src</parameter></paramdef> + <paramdef>int <parameter>size</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dst</parameter></term> + <listitem><para> +returns the string copy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>src</parameter></term> + <listitem><para> +specifies the string to copy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>size</parameter></term> + <listitem><para> +maximum number of characters (including the null terminator) to write to dst + </para></listitem> + </varlistentry> + </variablelist> + +This function copies up to <code><parameter>size</parameter> - 1</code> +characters of a null terminated string from <parameter>src</parameter> +to <parameter>dst</parameter>, and terminates it with a null, +changing all Latin-1 lowercase letters to uppercase. The string is +assumed to be encoded using ISO 8859-1. + </para> + + <para id="XmuCompareISOLatin1"> + <indexterm zone="XmuCompareISOLatin1"> + <primary><function>XmuCompareISOLatin1</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuCompareISOLatin1</function></funcdef> + <paramdef>const char *<parameter>first</parameter></paramdef> + <paramdef>const char *<parameter>second</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>first</parameter></term> + <listitem><para> + specifies a string to compare + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>second</parameter></term> + <listitem><para> +specifies a string to compare + </para></listitem> + </varlistentry> + </variablelist> + +This function compares two null terminated Latin-1 strings, ignoring case +differences, and returns an integer greater than, equal to, or less than 0, +according to whether first is lexicographically greater than, equal to, or +less than second. The two strings are assumed to be encoded using ISO +8859-1. + </para> + </sect1> + + <sect1 id='keyboard_event'> + <title>Keyboard Event Translation Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/Lookup.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Lookup.h</filename></primary> +</indexterm>. +and link against the libXmu library. + </para> + + <warning><para> +The functions in this section are <emphasis remap='B'>deprecated</emphasis> because they don't work +in most locales now supported by X11; the function +<function>XmbLookupString</function> +provides a better alternative. + </para></warning> + + <para id="XmuLookupLatin1"> + <indexterm zone="XmuLookupLatin1"> + <primary><function>XmuLookupLatin1</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupLatin1</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is identical to +<function>XLookupString</function>, +and exists only for naming symmetry with other functions. + </para> + + <para id="XmuLookupLatin2"> + <indexterm zone="XmuLookupLatin2"> + <primary><function>XmuLookupLatin2</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupLatin2</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to an Latin-2 (ISO 8859-2) string, or to an ASCII control string. + </para> + + <para id="XmuLookupLatin3"> + <indexterm zone="XmuLookupLatin3"> + <primary><function>XmuLookupLatin3</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupLatin3</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to an Latin-3 (ISO 8859-3) string, or to an ASCII control string. + </para> + + <para id="XmuLookupLatin4"> + <indexterm zone="XmuLookupLatin4"> + <primary><function>XmuLookupLatin4</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupLatin4</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to an Latin-4 (ISO 8859-4) string, or to an ASCII control string. + </para> + + <para id="XmuLookupKana"> + <indexterm zone="XmuLookupKana"> + <primary><function>XmuLookupKana</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupKana</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to a string in an encoding consisting of Latin-1 (ISO 8859-1) and ASCII +control in the Graphics Left half (values 0 to 127), and Katakana in the +Graphics Right half (values 128 to 255), using the values from JIS +X201-1976. + </para> + + <para id="XmuLookupJISX0201"> + <indexterm zone="XmuLookupJISX0201"> + <primary><function>XmuLookupJISX0201</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupJISX0201</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to a string in the JIS X0201-1976 encoding, including ASCII control. + </para> + + <para id="XmuLookupArabic"> + <indexterm zone="XmuLookupArabic"> + <primary><function>XmuLookupArabic</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupArabic</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to a Latin/Arabic (ISO 8859-6) string, or to an ASCII control string. + </para> + + <para id="XmuLookupCyrillic"> + <indexterm zone="XmuLookupCyrillic"> + <primary><function>XmuLookupCyrillic</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupCyrillic</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to a Latin/Cyrillic (ISO 8859-5) string, or to an ASCII control string. + </para> + + <para id="XmuLookupGreek"> + <indexterm zone="XmuLookupGreek"> + <primary><function>XmuLookupGreek</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupGreek</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to a Latin/Greek (ISO 8859-7) string, or to an ASCII control string. + </para> + + <para id="XmuLookupHebrew"> + <indexterm zone="XmuLookupHebrew"> + <primary><function>XmuLookupHebrew</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupHebrew</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event +to a Latin/Hebrew (ISO 8859-8) string, or to an ASCII control string. + </para> + + <para id="XmuLookupAPL"> + <indexterm zone="XmuLookupAPL"> + <primary><function>XmuLookupAPL</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuLookupAPL</function></funcdef> + <paramdef>XKeyEvent *<parameter>event</parameter></paramdef> + <paramdef>unsigned char *<parameter>buffer</parameter></paramdef> + <paramdef>int <parameter>nbytes</parameter></paramdef> + <paramdef>KeySym *<parameter>keysym</parameter></paramdef> + <paramdef>XComposeStatus *<parameter>status</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>event</parameter></term> + <listitem><para> +specifies the key event + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>buffer</parameter></term> + <listitem><para> +returns the translated characters + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>nbytes</parameter></term> + <listitem><para> +specifies the length of the buffer + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>keysym</parameter></term> + <listitem><para> +returns the computed KeySym, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>status</parameter></term> + <listitem><para> +specifies or returns the compose state + </para></listitem> + </varlistentry> + </variablelist> + +This function is similar to +<function>XLookupString</function>, +except that it maps a key event to an APL string. + </para> + + </sect1> + + <sect1 id='compound_text_functions'> + <title>Compound Text Functions</title> + + <para> +The functions defined in this section are for parsing Compound Text strings, +decomposing them into individual segments. Definitions needed to use these +routines are in the include file +<<filename class='headerfile'>X11/Xmu/Xct.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Xct.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <warning><para> +The functions in this section are <emphasis remap='B'>deprecated</emphasis> because they shift the +burden for recently introduced locale encodings to the application. The +use of the +<symbol>UTF8_STRING</symbol> +text encoding provides a better alternative. + </para></warning> + + <para> +A Compound Text string is represented as the following type: + + <synopsis> + typedef unsigned char *XctString; + </synopsis> + </para> + + <para id="XctCreate"> + <indexterm zone="XctCreate"> + <primary><function>XctCreate</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XctData <function>XctCreate</function></funcdef> + <paramdef>const XctString <parameter>string</parameter></paramdef> + <paramdef>int <parameter>length</parameter></paramdef> + <paramdef>XctFlags <parameter>flags</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>string</parameter></term> + <listitem><para> +the Compound Text string + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>length</parameter></term> + <listitem><para> +the number of bytes in string + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>flags</parameter></term> + <listitem><para> +parsing control flags + </para></listitem> + </varlistentry> + </variablelist> + +This function creates an +<type>XctData</type> +structure for parsing a Compound Text +string. The string need not be null terminated. The following flags are +defined to control parsing of the string: + + <variablelist> + <varlistentry> + <term><symbol>XctSingleSetSegments</symbol></term> + <listitem><para> +This means that returned segments should contain +characters from only one set (C0, C1, GL, GR). When this is requested, +<symbol>XctSegment</symbol> +is never returned by +<function>XctNextItem</function>, +instead +<symbol>XctC0Segment</symbol>, +<symbol>XctC1Segment</symbol>, +<symbol>XctGlSegment</symbol>, +and +<symbol>XctGRSegment</symbol> +are returned. C0 and C1 +segments are always returned as singleton characters. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctProvideExtensions</symbol></term> + <listitem><para> +This means that if the Compound Text string is from a +higher version than this code is implemented to, then syntactically correct +but unknown control sequences should be returned as +<symbol>XctExtension</symbol> +items by +<function>XctNextItem</function>. +If this flag is not set, and the Compound Text string version +indicates that extensions cannot be ignored, then each unknown control +sequence will be reported as an +<symbol>XctError</symbol>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctAcceptC0Extensions</symbol></term> + <listitem><para> +This means that if the Compound Text string is from +a higher version than this code is implemented to, then unknown C0 +characters should be treated as if they were legal, and returned as C0 +characters (regardless of how +<symbol>XctProvideExtensions</symbol> +is set) by +<function>XctNextItem</function>. +If this flag is not set, then all unknown C0 characters are treated +according to +<symbol>XctProvideExtensions</symbol>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctAcceptC1Extensions</symbol></term> + <listitem><para> +This means that if the Compound Text string is from +a higher version than this code is implemented to, then unknown C1 +characters should be treated as if they were legal, and returned as C1 +characters (regardless of how +<symbol>XctProvideExtensions</symbol> +is set) by +<function>XctNextItem</function>. +If this flag is not set, then all unknown C1 characters are treated +according to +<symbol>XctProvideExtensions</symbol>. + </para></listitem> + </varlistentry> + <varlistentry> + <term><symbol>XctHideDirection</symbol></term> + <listitem><para> +This means that horizontal direction changes should be +reported as +<symbol>XctHorizontal</symbol> +items by +<function>XctNextItem</function>. If this flag is not set, +then direction changes are not returned as items, but the current direction +is still maintained and reported for other items. The current direction is +given as an enumeration, with the values +<symbol>XctUnspecified</symbol>, +<symbol>XctLeftToRight</symbol>, +and +<symbol>XctRightToLeft</symbol>. + </para></listitem> + </varlistentry> + <varlistentry> + <term><symbol>XctFreeString</symbol></term> + <listitem><para> +This means that +<function>XctFree</function> +should free the Compound Text string that is passed to +<function>XctCreate</function>. +If this flag is not set, the string is not freed. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctShiftMultiGRToGL</symbol></term> + <listitem><para> +This means that +<function>XctNextItem</function> +should translate GR +segments on-the-fly into GL segments for the GR sets: GB2312.1980-1, +JISX0208.1983-1, and KSC5601.1987-1. + </para></listitem> + </varlistentry> + </variablelist> + </para> + + <para id="XctReset"> + <indexterm zone="XctReset"> + <primary><function>XctReset</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XctReset</function></funcdef> + <paramdef>XctData <parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +specifies the Compound Text structure + </para></listitem> + </varlistentry> + </variablelist> + +This function resets the +<type>XctData</type> +structure to reparse the Compound Text string from the beginning. + </para> + + <para id="XctNextItem"> + <indexterm zone="XctNextItem"> + <primary><function>XctNextItem</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XctResult <function>XctNextItem</function></funcdef> + <paramdef>XctData <parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +specifies the Compound Text structure + </para></listitem> + </varlistentry> + </variablelist> + +This function parses the next “item” from the Compound Text string. The +return value indicates what kind of item is returned. The item itself, its +length, and the current contextual state, are reported as components of the +<type>XctData</type> +structure. +<type>XctResult</type> +is an enumeration, with the following values: + + <variablelist> + <varlistentry> + <term><symbol>XctSegment</symbol></term> + <listitem><para> +the item contains some mixture of C0, GL, GR, and C1 characters. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctC0Segment</symbol></term> + <listitem><para> +the item contains only C0 characters. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctGLSegment</symbol></term> + <listitem><para> +the item contains only GL characters. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctC1Segment</symbol></term> + <listitem><para> +the item contains only C1 characters. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctGRSegment</symbol></term> + <listitem><para> +the item contains only GR characters. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctExtendedSegment</symbol></term> + <listitem><para> +the item contains an extended segment. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctExtension</symbol></term> + <listitem><para> +the item is an unknown extension control sequence. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctHorizontal</symbol></term> + <listitem><para> +the item indicates a change in horizontal direction or +depth. The new direction and depth are recorded in the +<type>XctData</type> +structure. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctEndOfText</symbol></term> + <listitem><para> +The end of the Compound Text string has been reached. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><symbol>XctError</symbol></term> + <listitem><para> +the string contains a syntactic or semantic error; no further +parsing should be performed. + </para></listitem> + </varlistentry> + </variablelist> + </para> + + <para id="XctData"> + <indexterm zone="XctData"> + <primary><type>XctData</type></primary> + </indexterm> +The following state values are stored in the +<type>XctData</type> +structure: + <synopsis> + XctString item; /* the action item */ + unsigned item_length; /* length of item in bytes */ + int char_size; /* the number of bytes per character in + * item, with zero meaning variable */ + char *encoding; /* the XLFD encoding name for item */ + XctHDirection horizontal; /* the direction of item */ + unsigned horz_depth; /* the current direction nesting depth */ + char *GL; /* the "{I} F" string for the current GL */ + char *GL_encoding; /* the XLFD encoding name for the current GL */ + int GL_set_size; /* 94 or 96 */ + int GL_char_size; /* the number of bytes per GL character */ + char *GR; /* the "{I} F" string for the current GR */ + char *GR_encoding; /* the XLFD encoding name for the current GR */ + int GR_set_size; /* 94 or 96 */ + int GR_char_size; /* number of bytes per GR character */ + char *GLGR_encoding; /* the XLFD encoding name for the current + * GL+GR, if known */ + </synopsis> + </para> + <para> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XctFree</function></funcdef> + <paramdef>XctData <parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +specifies the Compound Text structure + </para></listitem> + </varlistentry> + </variablelist> + +This function frees all data associated with the +<type>XctData</type> +structure. + </para> + + </sect1> + + <sect1 id='closedisplay_hook_functions'> + <title>CloseDisplay Hook Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/CloseHook.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/CloseHook.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para id="XmuAddCloseDisplayHook"> + <indexterm zone="XmuAddCloseDisplayHook"> + <primary><function>XmuAddCloseDisplayHook</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>CloseHook <function>XmuAddCloseDisplayHook</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>int <parameter>( *func )</parameter> + <funcparams>Display *, XPointer</funcparams></paramdef> + <paramdef>XPointer <parameter>arg</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>func</parameter></term> + <listitem><para> +specifies the function to call at display close + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>arg</parameter></term> + <listitem><para> +specifies arbitrary data to pass to <parameter>func</parameter> + </para></listitem> + </varlistentry> + </variablelist> + +This function adds a callback for the given display. When the display is +closed, the given function will be called with the given display and +argument as: + + <programlisting> + (*func)(dpy, arg) + </programlisting> + </para> + + <para> +The function is declared to return an int even though the value is ignored, +because some compilers used to have problems with functions returning void. + </para> + + <para> +This routine returns <symbol>NULL</symbol> if it was unable to add the +callback, otherwise it +returns an opaque handle that can be used to remove or lookup the callback. + </para> + + <para id="XmuRemoveCloseDisplayHook"> + <indexterm zone="XmuRemoveCloseDisplayHook"> + <primary><function>XmuRemoveCloseDisplayHook</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Bool <function>XmuRemoveCloseDisplayHook</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>CloseHook <parameter>handle</parameter></paramdef> + <paramdef>int <parameter>( *func )</parameter> + <funcparams>Display *, XPointer</funcparams></paramdef> + <paramdef>XPointer <parameter>arg</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>handle</parameter></term> + <listitem><para> +specifies the callback by id, or <symbol>NULL</symbol> + </para></listitem> + </varlistentry> + <varlistentry> + <term><function>func</function></term> + <listitem><para> +specifies the callback by function + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>arg</parameter></term> + <listitem><para> +specifies the function data to match + </para></listitem> + </varlistentry> + </variablelist> + +This function deletes a callback that has been added with +<function>XmuAddCloseDisplayHook</function>. +If handle is not <symbol>NULL</symbol>, it specifies the callback to +remove, and the func and arg parameters are ignored. If handle is <symbol>NULL</symbol>, the +first callback found to match the specified func and arg will be removed. +Returns +<symbol>True</symbol> +if a callback was removed, else returns +<symbol>False</symbol>. + </para> + + <para id="XmuLookupCloseDisplayHook"> + <indexterm zone="XmuLookupCloseDisplayHook"> + <primary><function>XmuLookupCloseDisplayHook</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Bool <function>XmuLookupCloseDisplayHook</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>CloseHook <parameter>handle</parameter></paramdef> + <paramdef>int <parameter>( *func )</parameter> + <funcparams>Display *, XPointer</funcparams></paramdef> + <paramdef>XPointer <parameter>arg</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>handle</parameter></term> + <listitem><para> +specifies the callback by id, or <symbol>NULL</symbol> + </para></listitem> + </varlistentry> + <varlistentry> + <term><function>func</function></term> + <listitem><para> +specifies the callback by function + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>arg</parameter></term> + <listitem><para> +specifies the function data to match + </para></listitem> + </varlistentry> + </variablelist> + +This function determines if a callback is installed. If handle is not +<symbol>NULL</symbol>, +it specifies the callback to look for, and the func and arg parameters are +ignored. If handle is <symbol>NULL</symbol>, the function will look for +any callback for the +specified func and arg. Returns +<symbol>True</symbol> +if a matching callback exists, else returns +<symbol>False</symbol>. + + + </para> + </sect1> + + <sect1 id='display_queue_functions'> + <title>Display Queue Functions</title> + + <para> +To use the functions and types defined in this section, you should include the +header file +<<filename class='headerfile'>X11/Xmu/DisplayQue.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/DisplayQue.h</filename></primary> +</indexterm> +and link against the libXmu library. +<filename class='headerfile'>DisplayQue.h</filename> defines the following +types: + + <indexterm zone="XmuDisplayQueue"> + <primary><type>XmuDisplayQueue</type></primary> + </indexterm> + <synopsis id="XmuDisplayQueue"> +typedef int (*XmuCloseDisplayQueueProc)(XmuDisplayQueue *queue, + XmuDisplayQueueEntry *entry); + +typedef int (*XmuFreeDisplayQueueProc)(XmuDisplayQueue *queue); + +typedef struct _XmuDisplayQueueEntry { + struct _XmuDisplayQueueEntry *prev, *next; + Display *display; + CloseHook closehook; + XPointer data; +} XmuDisplayQueueEntry; + +typedef struct _XmuDisplayQueue { + int nentries; + XmuDisplayQueueEntry *head, *tail; + XmuCloseDisplayQueueProc closefunc; + XmuFreeDisplayQueueProc freefunc; + XPointer data; +} XmuDisplayQueue; + </synopsis> + </para> + + <para id="XmuDQCreate"> + <indexterm zone="XmuDQCreate"> + <primary><function>XmuDQCreate</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XmuDisplayQueue *<function>XmuDQCreate</function></funcdef> + <paramdef>XmuCloseDisplayQueueProc <parameter>closefunc</parameter></paramdef> + <paramdef>XmuFreeDisplayQueueProc <parameter>freefunc</parameter></paramdef> + <paramdef>XPointer <parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>closefunc</parameter></term> + <listitem><para> +specifies the close function + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>freefunc</parameter></term> + <listitem><para> +specifies the free function + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +specifies private data for the functions + </para></listitem> + </varlistentry> + </variablelist> + +This function creates and returns an empty +<type>XmuDisplayQueue</type> +(which is really just a set of displays, but is called a queue for +historical reasons). The queue is initially empty, but displays +can be added using +<function>XmuAddDisplay</function>. +The data value is simply stored in the queue for use by the closefunc +and freefunc callbacks. +Whenever a display in the queue is closed using +<function>XCloseDisplay</function>, +the <parameter>closefunc</parameter> (if non-<symbol>NULL</symbol>) is called with the queue and the display's +<function>XmuDisplayQueueEntry</function> +as follows: + <programlisting> + (*closefunc)(queue, entry) + </programlisting> + </para> + + <para> +The <parameter>freefunc</parameter> (if non-<symbol>NULL</symbol>) is called whenever the last +display in the +queue is closed, as follows: + + <programlisting> + (*freefunc)(queue) + </programlisting> + </para> + + <para> +The application is responsible for actually freeing the queue, by calling +<function>XmuDQDestroy</function>. + </para> + + <para id="XmuDQAddDisplay"> + <indexterm zone="XmuDQAddDisplay"> + <primary><function>XmuDQAddDisplay</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XmuDisplayQueueEntry *<function>XmuDQAddDisplay</function></funcdef> + <paramdef>XmuDisplayQueue *<parameter>q</parameter></paramdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XPointer <parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + + <variablelist> + <varlistentry> + <term><parameter>q</parameter></term> + <listitem><para> +specifies the queue + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the display to add + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +specifies private data for the free function + </para></listitem> + </varlistentry> + </variablelist> + +This function adds the specified display to the queue. If successful, +the queue entry is returned, otherwise <symbol>NULL</symbol> is returned. +The data value is simply stored in the queue entry for use by the +queue's freefunc callback. This function does not attempt to prevent +duplicate entries in the queue; the caller should use +<function>XmuDQLookupDisplay</function> +to determine if a display has already been added to a queue. + </para> + + <para id="XmuDQLookupDisplay"> + <indexterm zone="XmuDQLookupDisplay"> + <primary><function>XmuDQLookupDisplay</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XmuDisplayQueueEntry *<function>XmuDQLookupDisplay</function></funcdef> + <paramdef>XmuDisplayQueue *<parameter>q</parameter></paramdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>q</parameter></term> + <listitem><para> +specifies the queue + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the display to lookup + </para></listitem> + </varlistentry> + </variablelist> + +This function returns the queue entry for the specified display, or +<symbol>NULL</symbol> if +the display is not in the queue. + </para> + + <para id="XmuDQNDisplays"> + <indexterm zone="XmuDQNDisplays"> + <primary><function>XmuDQNDisplays</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef><function>XmuDQNDisplays</function></funcdef> + <paramdef><parameter>q</parameter></paramdef> + </funcprototype> + </funcsynopsis> +This macro returns the number of displays in the specified queue. + </para> + + <para id="XmuDQRemoveDisplay"> + <indexterm zone="XmuDQRemoveDisplay"> + <primary><function>XmuDQRemoveDisplay</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Bool <function>XmuDQRemoveDisplay</function></funcdef> + <paramdef>XmuDisplayQueue *<parameter>q</parameter></paramdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>q</parameter></term> + <listitem><para> +specifies the queue + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the display to remove + </para></listitem> + </varlistentry> + </variablelist> + +This function removes the specified display from the specified queue. +No callbacks are performed. +If the display is not found in the queue, +<symbol>False</symbol> +is returned, otherwise +<symbol>True</symbol> +is returned. + </para> + + <para id="XmuDQDestroy"> + <indexterm zone="XmuDQDestroy"> + <primary><function>XmuDQDestroy</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Bool <function>XmuDQDestroy</function></funcdef> + <paramdef>XmuDisplayQueue *<parameter>q</parameter></paramdef> + <paramdef>Bool <parameter>docallbacks</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>q</parameter></term> + <listitem><para> +specifies the queue to destroy + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>docallbacks</parameter></term> + <listitem><para> +specifies whether close functions should be called + </para></listitem> + </varlistentry> + </variablelist> + +This function releases all memory associated with the specified queue. +If docallbacks is +<symbol>True</symbol>, +then the queue's closefunc callback (if non-<symbol>NULL</symbol>) is first called +for each display in the queue, even though +<function>XCloseDisplay</function> +is not called on the display. + </para> + + </sect1> + + <sect1 id='toolkit_convenience_functions'> + <title>Toolkit Convenience Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/Initer.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Initer.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para id="XmuAddInitializer"> + <indexterm zone="XmuAddInitializer"> + <primary><function>XmuAddInitializer</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuAddInitializer</function></funcdef> + <paramdef>void <parameter>( *func )</parameter> + <funcparams>XtAppContext, XPointer</funcparams></paramdef> + <paramdef>XPointer <parameter>data</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>func</parameter></term> + <listitem><para> +specifies the procedure to register + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>data</parameter></term> + <listitem><para> +specifies private data for the procedure + </para></listitem> + </varlistentry> + </variablelist> + +This function registers a procedure, to be invoked the first time +<function>XmuCallInitializers</function> +is called on a given application context. The procedure +is called with the application context and the specified data: + + <programlisting> + (*func)(app_con, data) + </programlisting> + </para> + + <para id="XmuCallInitializers"> + <indexterm zone="XmuCallInitializers"> + <primary><function>XmuCallInitializers</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuCallInitializers</function></funcdef> + <paramdef>XtAppContext <parameter>app_con</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>app_con</parameter></term> + <listitem><para> +specifies the application context to initialize + </para></listitem> + </varlistentry> + </variablelist> + +This function calls each of the procedures that have been registered with +<function>XmuAddInitializer</function>, +if this is the first time the application context has been passed to +<function>XmuCallInitializers</function>. +Otherwise, this function does nothing. + </para> + + </sect1> + + <sect1 id='standard_colormap_functions'> + <title>Standard Colormap Functions</title> + + <para> +To use the functions defined in this section, you should include the header +file +<<filename class='headerfile'>X11/Xmu/StdCmap.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/StdCmap.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para id="XmuAllStandardColormaps"> + <indexterm zone="XmuAllStandardColormaps"> + <primary><function>XmuAllStandardColormaps</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Status <function>XmuAllStandardColormaps</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + </variablelist> + + <indexterm> + <primary>colormaps</primary><secondary>standard</secondary> + </indexterm> +To create all of the appropriate standard colormaps for every visual of +every screen on a given display, use +<function>XmuAllStandardColormaps</function>. + </para> + + <para> +This function defines and retains as permanent resources all standard +colormaps which are meaningful for the visuals of each screen of the +display. It returns 0 on failure, non-zero on success. If the property of +any standard colormap is already defined, this function will redefine it. + </para> + + <para> +This function is intended to be used by window managers or a special client +at the start of a session. + </para> + + <para> +The standard colormaps of a screen are defined by properties associated with +the screen's root window. The property names of standard colormaps are +predefined, and each property name except +<property>RGB_DEFAULT_MAP</property> may describe at +most one colormap. + </para> + + <para> +The standard colormaps are: <property>RGB_BEST_MAP</property>, +<property>RGB_RED_MAP</property>, <property>RGB_GREEN_MAP</property>, +<property>RGB_BLUE_MAP</property>, <property>RGB_DEFAULT_MAP</property>, + and <property>RGB_GRAY_MAP</property>. Therefore a screen may +have at most 6 standard colormap properties defined. + </para> + + <para> +A standard colormap is associated with a particular visual of the screen. A +screen may have multiple visuals defined, including visuals of the same +class at different depths. Note that a visual id might be repeated for more +than one depth, so the visual id and the depth of a visual identify the +visual. The characteristics of the visual will determine which standard +colormaps are meaningful under that visual, and will determine how the +standard colormap is defined. Because a standard colormap is associated +with a specific visual, there must be a method of determining which visuals +take precedence in defining standard colormaps. + </para> + + <para> +The method used here is: for the visual of greatest depth, define all +standard colormaps meaningful to that visual class, according to this order +of (descending) precedence: +<symbol>DirectColor</symbol>; +<symbol>PseudoColor</symbol>; +<symbol>TrueColor</symbol> +and +<symbol>GrayScale</symbol>; +and finally +<symbol>StaticColor</symbol> +and +<symbol>StaticGray</symbol>. + </para> + +<para>This function allows success, on a per screen basis. For example, if a map +on screen 1 fails, the maps on screen 0, created earlier, will remain. +However, none on screen 1 will remain. If a map on screen 0 fails, none +will remain. + </para> + + <para> +See +<link linkend="XmuVisualStandardColormaps"><function>XmuVisualStandardColormaps</function></link> +for which standard colormaps are meaningful under these classes of visuals. + </para> + + <para id="XmuVisualStandardColormaps"> + <indexterm zone="XmuVisualStandardColormaps"> + <primary><function>XmuVisualStandardColormaps</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Status <function>XmuVisualStandardColormaps</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>int <parameter>screen</parameter></paramdef> + <paramdef>VisualID <parameter>visualid</parameter></paramdef> + <paramdef>unsigned int <parameter>depth</parameter></paramdef> + <paramdef>Bool <parameter>replace</parameter></paramdef> + <paramdef>Bool <parameter>retain</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen of the display + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>visualid</parameter></term> + <listitem><para> +specifies the visual type + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>depth</parameter></term> + <listitem><para> +specifies the visual depth + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>replace</parameter></term> + <listitem><para> +specifies whether or not to replace + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>retain</parameter></term> + <listitem><para> +specifies whether or not to retain + </para></listitem> + </varlistentry> + </variablelist> + +To create all of the appropriate standard colormaps for a given visual on a +given screen, use +<function>XmuVisualStandardColormaps</function>. + </para> + + <para> +This function defines all appropriate standard colormap properties for the +given visual. If replace is +<symbol>True</symbol>, +any previous definition will be removed. +If retain is +<symbol>True</symbol>, +new properties will be retained for the duration of the +server session. This function returns 0 on failure, non-zero on success. +On failure, no new properties will be defined, but old ones may have been +removed if replace was <symbol>True</symbol>. + </para> + + <para> +Not all standard colormaps are meaningful to all visual classes. This +routine will check and define the following properties for the following +classes, provided that the size of the colormap is not too small. For +<symbol>DirectColor</symbol> +and +<symbol>PseudoColor</symbol>: +<property>RGB_DEFAULT_MAP</property>, <property>RGB_BEST_MAP</property>, +<property>RGB_RED_MAP</property>, <property>RGB_GREEN_MAP</property>, +<property>RGB_BLUE_MAP</property>, and <property>RGB_GRAY_MAP</property>. +For +<symbol>TrueColor</symbol> +and +<symbol>StaticColor</symbol>: +<property>RGB_BEST_MAP</property>. For +<symbol>GrayScale</symbol> +and +<symbol>StaticGray</symbol>: +<property>RGB_GRAY_MAP</property>. + </para> + + <para id="XmuLookupStandardColormap"> + <indexterm zone="XmuLookupStandardColormap"> + <primary><function>XmuLookupStandardColormap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Status <function>XmuLookupStandardColormap</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>int <parameter>screen</parameter></paramdef> + <paramdef>VisualID <parameter>visualid</parameter></paramdef> + <paramdef>unsigned int <parameter>depth</parameter></paramdef> + <paramdef>Atom <parameter>property</parameter></paramdef> + <paramdef>Bool <parameter>replace</parameter></paramdef> + <paramdef>Bool <parameter>retain</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen of the display + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>visualid</parameter></term> + <listitem><para> +specifies the visual type + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>depth</parameter></term> + <listitem><para> +specifies the visual depth + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>property</parameter></term> + <listitem><para> +specifies the standard colormap property + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>replace</parameter></term> + <listitem><para> +specifies whether or not to replace + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>retain</parameter></term> + <listitem><para> +specifies whether or not to retain + </para></listitem> + </varlistentry> + </variablelist> + +To create a standard colormap if one does not currently exist, or replace +the currently existing standard colormap, use +<function>XmuLookupStandardColormap</function>. + </para> + + <para> +Given a screen, a visual, and a property, this function will determine the +best allocation for the property under the specified visual, and determine +the whether to create a new colormap or to use the default colormap of the +screen. + </para> + + <para> +If replace is True, any previous definition of the property will be +replaced. If retain is True, the property and the colormap will be made +permanent for the duration of the server session. However, pre-existing +property definitions which are not replaced cannot be made permanent by a +call to this function; a request to retain resources pertains to newly +created resources. + </para> + + <para> +This function returns 0 on failure, non-zero on success. A request to +create a standard colormap upon a visual which cannot support such a map is +considered a failure. An example of this would be requesting any standard +colormap property on a monochrome visual, or, requesting an +<property>RGB_BEST_MAP</property> on +a display whose colormap size is 16. + </para> + + <para id="XmuGetColormapAllocation"> + <indexterm zone="XmuGetColormapAllocation"> + <primary><function>XmuGetColormapAllocation</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Status <function>XmuGetColormapAllocation</function></funcdef> + <paramdef>XVisualInfo *<parameter>vinfo</parameter></paramdef> + <paramdef>Atom <parameter>property</parameter></paramdef> + <paramdef>unsigned long *<parameter>red_max</parameter></paramdef> + <paramdef>unsigned long *<parameter>green_max</parameter></paramdef> + <paramdef>unsigned long *<parameter>blue_max</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>vinfo</parameter></term> + <listitem><para> +specifies visual information for a chosen visual + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>property</parameter></term> + <listitem><para> +specifies one of the standard colormap property names + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>red_max</parameter></term> + <listitem><para> +returns maximum red value</para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>green_max</parameter></term> + <listitem><para> +returns maximum green value + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>blue_max</parameter></term> + <listitem><para> +returns maximum blue value + </para></listitem> + </varlistentry> + </variablelist> + +To determine the best allocation of reds, greens, and blues in a standard +colormap, use +<function>XmuGetColormapAllocation</function>. + </para> + + <para> +<function>XmuGetColormapAllocation</function> +returns 0 on failure, non-zero on success. It is +assumed that the visual is appropriate for the colormap property. + </para> + + <para id="XmuStandardColormap"> + <indexterm zone="XmuStandardColormap"> + <primary><function>XmuStandardColormap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XStandardColormap *<function>XmuStandardColormap</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>int <parameter>screen</parameter></paramdef> + <paramdef>VisualID <parameter>visualid</parameter></paramdef> + <paramdef>unsigned int <parameter>depth</parameter></paramdef> + <paramdef>Atom <parameter>property</parameter></paramdef> + <paramdef>Colormap <parameter>cmap</parameter></paramdef> + <paramdef>unsigned long <parameter>red_max</parameter></paramdef> + <paramdef>unsigned long <parameter>green_max</parameter></paramdef> + <paramdef>unsigned long <parameter>blue_max</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen of the display + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>visualid</parameter></term> + <listitem><para> +specifies the visual type + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>depth</parameter></term> + <listitem><para> +specifies the visual depth + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>property</parameter></term> + <listitem><para> +specifies the standard colormap property + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>cmap</parameter></term> + <listitem><para> +specifies the colormap ID, or None + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>red_max</parameter></term> + <listitem><para> +specifies the red allocation + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>green_max</parameter></term> + <listitem><para> +specifies the green allocation + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>blue_max</parameter></term> + <listitem><para> +specifies the blue allocation + </para></listitem> + </varlistentry> + </variablelist> + +To create any one standard colormap, use +<function>XmuStandardColormap</function>. + </para> + + <para> +This function creates a standard colormap for the given screen, visualid, +and visual depth, with the given red, green, and blue maximum values, with +the given standard property name. Upon success, it returns a pointer to an +<function>XStandardColormap</function> +structure which describes the newly created colormap. +Upon failure, it returns <symbol>NULL</symbol>. +If cmap is the default colormap of the screen, the standard colormap +will be defined on the default colormap; otherwise a new colormap is created. + </para> + + <para> +Resources created by this function are not made permanent; that is the +caller's responsibility. + </para> + + <para id="XmuCreateColormap"> + <indexterm zone="XmuCreateColormap"> + <primary><function>XmuCreateColormap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>Status <function>XmuCreateColormap</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>XStandardColormap *<parameter>colormap</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection under which the map is created + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>colormap</parameter></term> + <listitem><para> +specifies the map to be created</para></listitem> + </varlistentry> + </variablelist> + +To create any one colormap which is described by an +<structname>XStandardColormap</structname> +structure, use +<function>XmuCreateColormap</function>. + </para> + + <para> +This function returns 0 on failure, and non-zero on success. The base_pixel +of the colormap is set on success. Resources created by this function are +not made permanent. No argument error checking is provided; use at your own +risk. + </para> + + <para> +All colormaps are created with read-only allocations, with the exception of +read-only allocations of colors which fail +to return the expected pixel value, and these are individually defined as +read/write allocations. This is done so that all the cells defined in the +colormap are contiguous, for use in image processing. This typically +happens with White and Black in the default map. + </para> + + <para> +Colormaps of static visuals are considered to be successfully created if the +map of the static visual matches the definition given in the standard +colormap structure. + </para> + + <para id="XmuDeleteStandardColormap"> + <indexterm zone="XmuDeleteStandardColormap"> + <primary><function>XmuDeleteStandardColormap</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuDeleteStandardColormap</function></funcdef> + <paramdef>Display *<parameter>dpy</parameter></paramdef> + <paramdef>Screen *<parameter>screen</parameter></paramdef> + <paramdef>Atom <parameter>property</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>dpy</parameter></term> + <listitem><para> +specifies the connection to the X server + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>screen</parameter></term> + <listitem><para> +specifies the screen of the display + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>property</parameter></term> + <listitem><para> +specifies the standard colormap property + </para></listitem> + </varlistentry> + </variablelist> + +To remove any standard colormap property, use +<function>XmuDeleteStandardColormap</function>. +This function will remove the specified property from the specified screen, +releasing any resources used by the colormap(s) of the property, if +possible. + </para> + + </sect1> + + <sect1 id='widget_description_functions'> + <title>Widget Description Functions</title> + + <para> +The functions defined in this section are for building a description of +the structure of and resources associated with a hierarchy of widget classes. +This package is typically used by applications that wish to manipulate the +widget set itself. + </para> + + <para> +The definitions needed to use these interfaces are in the header file +<<filename class='headerfile'>X11/Xmu/WidgetNode.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/WidgetNode.h</filename></primary> +</indexterm>. +To call these functions, you need to link against the libXmu library. +The following function must be called before any of the others described +below: + + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuWnInitializeNodes</function></funcdef> + <paramdef>XmuWidgetNode *<parameter>node_array</parameter></paramdef> + <paramdef>int <parameter>num_nodes</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>node_array</parameter></term> + <listitem><para> +specifies a list of widget classes, in alphabetical order + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_nodes</parameter></term> + <listitem><para> +specifies the number of widget classes in the node array + </para></listitem> + </varlistentry> + </variablelist> + </para> + + <para> +To determine the resources provided by a widget class or classes, use + + <funcsynopsis> + <funcprototype> + <funcdef>void <function>XmuWnFetchResources</function></funcdef> + <paramdef>XmuWidgetNode *<parameter>node</parameter></paramdef> + <paramdef>Widget <parameter>toplevel</parameter></paramdef> + <paramdef>XmuWidgetNode *<parameter>top_node</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>node</parameter></term> + <listitem><para> +specifies the widget class for which resources should be obtained. + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>toplevel</parameter></term> + <listitem><para> +specifies the widget that should be used for creating an instance of +<parameter>node</parameter> +from which resources are extracted. This is typically the value returned +by <function>XtAppInitialize</function>. + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>top_node</parameter></term> + <listitem><para> +specifies the ancestor of <parameter>node</parameter> that should be +treated as the root +of the widget inheritance tree (used in determining which ancestor contributed +which resources). + </para></listitem> + </varlistentry> + </variablelist> + </para> + + <para> +Each widget class inherits the resources of its parent. To count the number +of resources contributed by a particular widget class, use: + + <funcsynopsis> + <funcprototype> + <funcdef>int <function>XmuWnCountOwnedResources</function></funcdef> + <paramdef>XmuWidgetNode *<parameter>node</parameter></paramdef> + <paramdef>XmuWidgetNode *<parameter>owner_node</parameter></paramdef> + <paramdef>Bool <parameter>constraints</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>node</parameter></term> + <listitem><para> +specifies the widget class whose resources are being examined. + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>owner_node</parameter></term> + <listitem><para> +specifies the widget class of the ancestor of <parameter>node</parameter> +whose contributions +are being counted. + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>constraints</parameter></term> + <listitem><para> +specifies whether or not to count constraint resources or normal resources. + </para></listitem> + </varlistentry> + </variablelist> + +This routine returns the number of resources contributed (or +“owned”) by +the specified widget class. + </para> + + <para id="XmuWnNameToNode"> + <indexterm zone="XmuWnNameToNode"> + <primary><function>XmuWnNameToNode</function></primary> + </indexterm> + <funcsynopsis> + <funcprototype> + <funcdef>XmuWidgetNode *<function>XmuWnNameToNode</function></funcdef> + <paramdef>XmuWidgetNode *<parameter>node_list</parameter></paramdef> + <paramdef>int <parameter>num_nodes</parameter></paramdef> + <paramdef>char *<parameter>name</parameter></paramdef> + </funcprototype> + </funcsynopsis> + <variablelist> + <varlistentry> + <term><parameter>node_list</parameter></term> + <listitem><para> +specifies a list of widget nodes + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>num_nodes</parameter></term> + <listitem><para> +specifies the number of nodes in the list + </para></listitem> + </varlistentry> + <varlistentry> + <term><parameter>name</parameter></term> + <listitem><para> +specifies the name of the widget class in the node list to search for + </para></listitem> + </varlistentry> + </variablelist> + +This function returns the WidgetNode in the list that matches the given +widget name or widget class name. If no match is found, it returns +<symbol>NULL</symbol>. + </para> + + </sect1> + + <sect1 id='participation_in_the_editres_protocol'> + <title>Participation in the Editres Protocol</title> + + <para> + <indexterm> + <primary>editres</primary> + </indexterm> +To participate in the editres protocol, applications which are not based +on the Athena widget set should include the header file +<<filename class='headerfile'>X11/Xmu/Editres.h</filename>> +<indexterm> +<primary><filename class='headerfile'>X11/Xmu/Editres.h</filename></primary> +</indexterm> +and link against the libXmu library. + </para> + + <para> +To participate in the editres protocol, Xt applications which do not rely +on the Athena widget set should register the editres protocol handler on +each shell widget in the application, specifying an event mask of 0, +nonmaskable events, and client data as <symbol>NULL</symbol>: + + <programlisting> +XtAddEventHandler(shell, (EventMask) 0, True, _XEditResCheckMessages, NULL); + </programlisting> + </para> + </sect1> + + <index /> +</article> diff --git a/lib/libXmu/doc/xlogo.svg b/lib/libXmu/doc/xlogo.svg new file mode 100644 index 000000000..9c1168b42 --- /dev/null +++ b/lib/libXmu/doc/xlogo.svg @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46+devel" + width="55" + height="55" + xml:space="preserve" + sodipodi:docname="xlogo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0"> + <title>X Window System Logo</title> + <metadata><rdf:RDF><cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>X Window System Logo</dc:title> + <dc:contributor><cc:Agent><dc:title>Designed by Danny Cheng +Converted to EPS by Stephen Gildea +Converted from EPS to SVG by Inkscape</dc:title></cc:Agent></dc:contributor> + <cc:license rdf:resource="" /> + </cc:Work></rdf:RDF></metadata> + <g transform="matrix(0.1,0,0,-0.1,0,50)"> + <path + d="M 440,440 350,440 0,0 90,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <path + d="m 40,0 180,220 50,0 L 90,0 40,0 z m 360,440 -180,-220 -50,0 180,220" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <path + d="M 0,440 110,440 440,0 330,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <path + d="M 400,440 390,440 40,0 50,0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + </g> +</svg> diff --git a/lib/libXmu/include/Makefile.am b/lib/libXmu/include/Makefile.am index f28021f86..413dd5b87 100644 --- a/lib/libXmu/include/Makefile.am +++ b/lib/libXmu/include/Makefile.am @@ -21,4 +21,5 @@ xmuinclude_HEADERS = \ X11/Xmu/SysUtil.h \ X11/Xmu/WidgetNode.h \ X11/Xmu/WinUtil.h \ - X11/Xmu/Xct.h + X11/Xmu/Xct.h \ + X11/Xmu/WhitePoint.h diff --git a/lib/libXmu/include/Makefile.in b/lib/libXmu/include/Makefile.in index d3a102fe3..5ac160ddf 100644 --- a/lib/libXmu/include/Makefile.in +++ b/lib/libXmu/include/Makefile.in @@ -66,6 +66,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AR = @AR@ @@ -95,13 +96,25 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ GREP = @GREP@ HAS_SNPRINTF = @HAS_SNPRINTF@ +HAVE_FOP_FALSE = @HAVE_FOP_FALSE@ +HAVE_FOP_TRUE = @HAVE_FOP_TRUE@ +HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@ +HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@ +HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ +HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ +HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ +HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -126,6 +139,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@ MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NMEDIT = @NMEDIT@ @@ -143,11 +157,16 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ +XMLTO = @XMLTO@ XMUU_CFLAGS = @XMUU_CFLAGS@ XMUU_LIBS = @XMUU_LIBS@ XMU_CFLAGS = @XMU_CFLAGS@ XMU_LIBS = @XMU_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ @@ -168,7 +187,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -219,7 +237,8 @@ xmuinclude_HEADERS = \ X11/Xmu/SysUtil.h \ X11/Xmu/WidgetNode.h \ X11/Xmu/WinUtil.h \ - X11/Xmu/Xct.h + X11/Xmu/Xct.h \ + X11/Xmu/WhitePoint.h all: all-am @@ -233,9 +252,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + $(AUTOMAKE) --foreign include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/lib/libXmu/include/X11/Xmu/Atoms.h b/lib/libXmu/include/X11/Xmu/Atoms.h index f7b4c8f7e..3d8691025 100644 --- a/lib/libXmu/include/X11/Xmu/Atoms.h +++ b/lib/libXmu/include/X11/Xmu/Atoms.h @@ -1,5 +1,3 @@ -/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/CharSet.h b/lib/libXmu/include/X11/Xmu/CharSet.h index 32cebfeda..1ce9166a0 100644 --- a/lib/libXmu/include/X11/Xmu/CharSet.h +++ b/lib/libXmu/include/X11/Xmu/CharSet.h @@ -1,5 +1,3 @@ -/* $Xorg: CharSet.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.7 2001/01/17 19:42:53 dawes Exp $ */ - /* * The interfaces described by this header file are for miscellaneous utilities * and are not part of the Xlib standard. diff --git a/lib/libXmu/include/X11/Xmu/CloseHook.h b/lib/libXmu/include/X11/Xmu/CloseHook.h index 1940a793b..2481ebf3e 100644 --- a/lib/libXmu/include/X11/Xmu/CloseHook.h +++ b/lib/libXmu/include/X11/Xmu/CloseHook.h @@ -1,5 +1,3 @@ -/* $Xorg: CloseHook.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/Converters.h b/lib/libXmu/include/X11/Xmu/Converters.h index 11055d950..3779750c6 100644 --- a/lib/libXmu/include/X11/Xmu/Converters.h +++ b/lib/libXmu/include/X11/Xmu/Converters.h @@ -1,5 +1,3 @@ -/* $Xorg: Converters.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Converters.h,v 1.5 2001/01/17 19:42:53 dawes Exp $ */ - /* * The interfaces described by this header file are for miscellaneous utilities * and are not part of the Xlib standard. diff --git a/lib/libXmu/include/X11/Xmu/CurUtil.h b/lib/libXmu/include/X11/Xmu/CurUtil.h index 27ab18848..3524d7704 100644 --- a/lib/libXmu/include/X11/Xmu/CurUtil.h +++ b/lib/libXmu/include/X11/Xmu/CurUtil.h @@ -1,5 +1,3 @@ -/* $Xorg: CurUtil.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/CvtCache.h b/lib/libXmu/include/X11/Xmu/CvtCache.h index d9b967ab7..7441e2f2e 100644 --- a/lib/libXmu/include/X11/Xmu/CvtCache.h +++ b/lib/libXmu/include/X11/Xmu/CvtCache.h @@ -1,5 +1,3 @@ -/* $Xorg: CvtCache.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Public Interfaces diff --git a/lib/libXmu/include/X11/Xmu/DisplayQue.h b/lib/libXmu/include/X11/Xmu/DisplayQue.h index 9f9013c1e..b37a58133 100644 --- a/lib/libXmu/include/X11/Xmu/DisplayQue.h +++ b/lib/libXmu/include/X11/Xmu/DisplayQue.h @@ -1,5 +1,3 @@ -/* $Xorg: DisplayQue.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */ #ifndef _XMU_DISPLAYQUE_H_ #define _XMU_DISPLAYQUE_H_ diff --git a/lib/libXmu/include/X11/Xmu/Drawing.h b/lib/libXmu/include/X11/Xmu/Drawing.h index 9ffed3bab..91d764b77 100644 --- a/lib/libXmu/include/X11/Xmu/Drawing.h +++ b/lib/libXmu/include/X11/Xmu/Drawing.h @@ -1,5 +1,3 @@ -/* $Xorg: Drawing.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.6 2001/12/14 19:55:42 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/Editres.h b/lib/libXmu/include/X11/Xmu/Editres.h index 2a3f3e250..0c1ffe075 100644 --- a/lib/libXmu/include/X11/Xmu/Editres.h +++ b/lib/libXmu/include/X11/Xmu/Editres.h @@ -1,5 +1,3 @@ -/* $Xorg: Editres.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Editres.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Xfuncproto.h> diff --git a/lib/libXmu/include/X11/Xmu/EditresP.h b/lib/libXmu/include/X11/Xmu/EditresP.h index 886205bf2..6f7c739ab 100644 --- a/lib/libXmu/include/X11/Xmu/EditresP.h +++ b/lib/libXmu/include/X11/Xmu/EditresP.h @@ -1,5 +1,3 @@ -/* $Xorg: EditresP.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ /* * Author: Chris D. Peterson, MIT X Consortium diff --git a/lib/libXmu/include/X11/Xmu/Error.h b/lib/libXmu/include/X11/Xmu/Error.h index f992930ec..c69bf141e 100644 --- a/lib/libXmu/include/X11/Xmu/Error.h +++ b/lib/libXmu/include/X11/Xmu/Error.h @@ -1,5 +1,3 @@ -/* $Xorg: Error.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Error.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/ExtAgent.h b/lib/libXmu/include/X11/Xmu/ExtAgent.h index b0caf3699..b30014012 100644 --- a/lib/libXmu/include/X11/Xmu/ExtAgent.h +++ b/lib/libXmu/include/X11/Xmu/ExtAgent.h @@ -1,5 +1,3 @@ -/* $Xorg: ExtAgent.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994,1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xfuncproto.h> diff --git a/lib/libXmu/include/X11/Xmu/Initer.h b/lib/libXmu/include/X11/Xmu/Initer.h index 5e870af8c..2ba86e833 100644 --- a/lib/libXmu/include/X11/Xmu/Initer.h +++ b/lib/libXmu/include/X11/Xmu/Initer.h @@ -1,5 +1,3 @@ -/* $Xorg: Initer.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.h,v 1.5 2001/01/17 19:42:56 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/Lookup.h b/lib/libXmu/include/X11/Xmu/Lookup.h index 3699a2719..e99b8b1e5 100644 --- a/lib/libXmu/include/X11/Xmu/Lookup.h +++ b/lib/libXmu/include/X11/Xmu/Lookup.h @@ -1,7 +1,3 @@ -/* - * $XFree86$ - */ - /************************************************************ Copyright 1999 by Thomas E. Dickey <dickey@clark.net> diff --git a/lib/libXmu/include/X11/Xmu/Misc.h b/lib/libXmu/include/X11/Xmu/Misc.h index b47fbba4b..650771b19 100644 --- a/lib/libXmu/include/X11/Xmu/Misc.h +++ b/lib/libXmu/include/X11/Xmu/Misc.h @@ -1,5 +1,3 @@ -/* $Xorg: Misc.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group diff --git a/lib/libXmu/include/X11/Xmu/StdCmap.h b/lib/libXmu/include/X11/Xmu/StdCmap.h index b268d073c..afad78f6d 100644 --- a/lib/libXmu/include/X11/Xmu/StdCmap.h +++ b/lib/libXmu/include/X11/Xmu/StdCmap.h @@ -1,5 +1,3 @@ -/* $Xorg: StdCmap.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.8 2001/01/23 17:38:14 keithp Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/StdSel.h b/lib/libXmu/include/X11/Xmu/StdSel.h index f7c9452de..c61214dd9 100644 --- a/lib/libXmu/include/X11/Xmu/StdSel.h +++ b/lib/libXmu/include/X11/Xmu/StdSel.h @@ -1,5 +1,3 @@ -/* $Xorg: StdSel.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/SysUtil.h b/lib/libXmu/include/X11/Xmu/SysUtil.h index 9f5b033ac..da5b189f4 100644 --- a/lib/libXmu/include/X11/Xmu/SysUtil.h +++ b/lib/libXmu/include/X11/Xmu/SysUtil.h @@ -1,5 +1,3 @@ -/* $Xorg: SysUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.9 2001/12/14 19:55:55 dawes Exp $ */ #ifndef _SYSUTIL_H_ #define _SYSUTIL_H_ @@ -48,11 +45,7 @@ int XmuSnprintf _Xconst char *fmt, ... ) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4))) -__attribute((format(printf,3,4))) -#endif -; +_X_ATTRIBUTE_PRINTF(3,4); #endif _XFUNCPROTOEND diff --git a/lib/libXmu/include/X11/Xmu/WhitePoint.h b/lib/libXmu/include/X11/Xmu/WhitePoint.h index a05bddd4a..9f41c4221 100644 --- a/lib/libXmu/include/X11/Xmu/WhitePoint.h +++ b/lib/libXmu/include/X11/Xmu/WhitePoint.h @@ -1,5 +1,3 @@ -/* $Xorg: WhitePoint.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group diff --git a/lib/libXmu/include/X11/Xmu/WidgetNode.h b/lib/libXmu/include/X11/Xmu/WidgetNode.h index 75050d253..f9d2cb57f 100644 --- a/lib/libXmu/include/X11/Xmu/WidgetNode.h +++ b/lib/libXmu/include/X11/Xmu/WidgetNode.h @@ -1,5 +1,3 @@ -/* $Xorg: WidgetNode.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.5 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/include/X11/Xmu/WinUtil.h b/lib/libXmu/include/X11/Xmu/WinUtil.h index 0445bcfa8..c3d11a86a 100644 --- a/lib/libXmu/include/X11/Xmu/WinUtil.h +++ b/lib/libXmu/include/X11/Xmu/WinUtil.h @@ -1,5 +1,3 @@ -/* $Xorg: WinUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/libXmu/include/X11/Xmu/Xct.h b/lib/libXmu/include/X11/Xmu/Xct.h index b06644ae0..514ad7fea 100644 --- a/lib/libXmu/include/X11/Xmu/Xct.h +++ b/lib/libXmu/include/X11/Xmu/Xct.h @@ -1,5 +1,3 @@ -/* $Xorg: Xct.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.h,v 1.6 2001/01/17 19:42:58 dawes Exp $ */ #ifndef _Xct_h #define _Xct_h diff --git a/lib/libXmu/include/X11/Xmu/Xmu.h b/lib/libXmu/include/X11/Xmu/Xmu.h index c503a41b8..ad7948846 100644 --- a/lib/libXmu/include/X11/Xmu/Xmu.h +++ b/lib/libXmu/include/X11/Xmu/Xmu.h @@ -1,5 +1,3 @@ -/* $Xorg: Xmu.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.9 2001/12/14 19:55:59 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities @@ -35,6 +32,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XMU_H_ #define _XMU_H_ +#include <X11/Xfuncproto.h> #include <X11/Intrinsic.h> #include <X11/Xmu/Atoms.h> /* _XA_... */ #include <X11/Xmu/CharSet.h> /* CopyISOLatin1Lowered */ @@ -117,11 +115,7 @@ XmuScanline *XmuScanlineXorSegment(XmuScanline*, XmuSegment*); #ifndef _SYSUTIL_H_ int XmuSnprintf(char *str, int size, _Xconst char *fmt, ...) -#if defined(__GNUC__) && \ - ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4))) -__attribute((format(printf,3,4))) -#endif -; + _X_ATTRIBUTE_PRINTF(3,4); #endif #endif /* _XMU_H_ */ diff --git a/lib/libXmu/src/AllCmap.c b/lib/libXmu/src/AllCmap.c index 09ae52aa4..1daa8de7c 100644 --- a/lib/libXmu/src/AllCmap.c +++ b/lib/libXmu/src/AllCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: AllCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.7 2001/01/17 19:42:53 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/Atoms.c b/lib/libXmu/src/Atoms.c index dcdf497a5..48e243194 100644 --- a/lib/libXmu/src/Atoms.c +++ b/lib/libXmu/src/Atoms.c @@ -1,5 +1,3 @@ -/* $Xorg: Atoms.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * This file contains routines to cache atoms, avoiding multiple diff --git a/lib/libXmu/src/ClientWin.c b/lib/libXmu/src/ClientWin.c index 7fc273f1f..3af323e0a 100644 --- a/lib/libXmu/src/ClientWin.c +++ b/lib/libXmu/src/ClientWin.c @@ -1,5 +1,3 @@ -/* $Xorg: ClientWin.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.7 2001/12/14 19:55:34 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/Clip.c b/lib/libXmu/src/Clip.c index 121a69f23..ff87a80c0 100644 --- a/lib/libXmu/src/Clip.c +++ b/lib/libXmu/src/Clip.c @@ -24,7 +24,6 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/Xmu/Clip.c,v 1.1 1998/08/16 10:25:03 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/CloseHook.c b/lib/libXmu/src/CloseHook.c index 5e66d0cad..ca9d9def6 100644 --- a/lib/libXmu/src/CloseHook.c +++ b/lib/libXmu/src/CloseHook.c @@ -1,5 +1,3 @@ -/* $Xorg: CloseHook.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -24,7 +22,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * CloseDisplayHook package - provide callback on XCloseDisplay diff --git a/lib/libXmu/src/CmapAlloc.c b/lib/libXmu/src/CmapAlloc.c index 1f27f1eef..0bccb829c 100644 --- a/lib/libXmu/src/CmapAlloc.c +++ b/lib/libXmu/src/CmapAlloc.c @@ -1,5 +1,3 @@ -/* $Xorg: CmapAlloc.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/libXmu/src/CrCmap.c b/lib/libXmu/src/CrCmap.c index 011c71465..4343f5f0f 100644 --- a/lib/libXmu/src/CrCmap.c +++ b/lib/libXmu/src/CrCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/libXmu/src/CrPixFBit.c b/lib/libXmu/src/CrPixFBit.c index c7ff6caf2..9489a19a0 100644 --- a/lib/libXmu/src/CrPixFBit.c +++ b/lib/libXmu/src/CrPixFBit.c @@ -1,5 +1,3 @@ -/* $Xorg: CrPixFBit.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/lib/libXmu/src/CursorName.c b/lib/libXmu/src/CursorName.c index 17f390246..8867e8fa4 100644 --- a/lib/libXmu/src/CursorName.c +++ b/lib/libXmu/src/CursorName.c @@ -1,5 +1,3 @@ -/* $Xorg: CursorName.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.7tsi Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/CvtCache.c b/lib/libXmu/src/CvtCache.c index 8dd4602ea..39a5d0caf 100644 --- a/lib/libXmu/src/CvtCache.c +++ b/lib/libXmu/src/CvtCache.c @@ -1,5 +1,3 @@ -/* $Xorg: CvtCache.c,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.6 2001/08/23 00:03:21 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/src/CvtStdSel.c b/lib/libXmu/src/CvtStdSel.c index a6f206ade..81d1a8474 100644 --- a/lib/libXmu/src/CvtStdSel.c +++ b/lib/libXmu/src/CvtStdSel.c @@ -1,6 +1,3 @@ -/* $Xorg: CvtStdSel.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ -/* $XdotOrg: xc/lib/Xmu/CvtStdSel.c,v 1.5 2005/05/22 04:36:38 alanc Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.19 2001/11/21 16:22:59 tsi Exp $ */ /* * This file contains routines to handle common selection targets. diff --git a/lib/libXmu/src/DefErrMsg.c b/lib/libXmu/src/DefErrMsg.c index d1aa9ad9a..37fe0aa31 100644 --- a/lib/libXmu/src/DefErrMsg.c +++ b/lib/libXmu/src/DefErrMsg.c @@ -1,5 +1,3 @@ -/* $Xorg: DefErrMsg.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,13 +23,11 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <stdio.h> -#define NEED_EVENTS #include <X11/Xlibint.h> #include <X11/Xproto.h> #include <X11/Xmu/Error.h> diff --git a/lib/libXmu/src/DelCmap.c b/lib/libXmu/src/DelCmap.c index 1f2c6abe8..f29ae00f0 100644 --- a/lib/libXmu/src/DelCmap.c +++ b/lib/libXmu/src/DelCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: DelCmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/libXmu/src/DisplayQue.c b/lib/libXmu/src/DisplayQue.c index ae9f92e1d..de76a69c4 100644 --- a/lib/libXmu/src/DisplayQue.c +++ b/lib/libXmu/src/DisplayQue.c @@ -1,5 +1,3 @@ -/* $Xorg: DisplayQue.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/src/Distinct.c b/lib/libXmu/src/Distinct.c index f00b00b5a..9d31494ec 100644 --- a/lib/libXmu/src/Distinct.c +++ b/lib/libXmu/src/Distinct.c @@ -1,5 +1,3 @@ -/* $Xorg: Distinct.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/libXmu/src/DrRndRect.c b/lib/libXmu/src/DrRndRect.c index 7fe5489d0..1373de07d 100644 --- a/lib/libXmu/src/DrRndRect.c +++ b/lib/libXmu/src/DrRndRect.c @@ -1,5 +1,3 @@ -/* $Xorg: DrRndRect.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * XmuDrawRoundedRectangle, XmuFillRoundedRectangle diff --git a/lib/libXmu/src/DrawLogo.c b/lib/libXmu/src/DrawLogo.c index 74e64d866..4af89b530 100644 --- a/lib/libXmu/src/DrawLogo.c +++ b/lib/libXmu/src/DrawLogo.c @@ -1,5 +1,3 @@ -/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/EditresCom.c b/lib/libXmu/src/EditresCom.c index 51ac24895..0208cdfe8 100644 --- a/lib/libXmu/src/EditresCom.c +++ b/lib/libXmu/src/EditresCom.c @@ -1,5 +1,3 @@ -/* $Xorg: EditresCom.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.21 2003/10/24 15:44:05 tsi Exp $ */ /* * Author: Chris D. Peterson, Dave Sternlicht, MIT X Consortium diff --git a/lib/libXmu/src/ExtAgent.c b/lib/libXmu/src/ExtAgent.c index 27955678f..6b0dfdbd8 100644 --- a/lib/libXmu/src/ExtAgent.c +++ b/lib/libXmu/src/ExtAgent.c @@ -1,5 +1,3 @@ -/* $Xorg: ExtAgent.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/FToCback.c b/lib/libXmu/src/FToCback.c index 6da4826f7..4ca8d459a 100644 --- a/lib/libXmu/src/FToCback.c +++ b/lib/libXmu/src/FToCback.c @@ -1,5 +1,3 @@ -/* $Xorg: FToCback.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988,1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/GetHost.c b/lib/libXmu/src/GetHost.c index 19793fd7f..2f0bccded 100644 --- a/lib/libXmu/src/GetHost.c +++ b/lib/libXmu/src/GetHost.c @@ -1,5 +1,3 @@ -/* $Xorg: GetHost.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/src/GrayPixmap.c b/lib/libXmu/src/GrayPixmap.c index 478269f8a..ccea46116 100644 --- a/lib/libXmu/src/GrayPixmap.c +++ b/lib/libXmu/src/GrayPixmap.c @@ -1,5 +1,3 @@ -/* $Xorg: GrayPixmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/Initer.c b/lib/libXmu/src/Initer.c index f18492f69..bd7678480 100644 --- a/lib/libXmu/src/Initer.c +++ b/lib/libXmu/src/Initer.c @@ -1,5 +1,3 @@ -/* $Xorg: Initer.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* Created By: Chris D. Peterson * MIT X Consortium diff --git a/lib/libXmu/src/LocBitmap.c b/lib/libXmu/src/LocBitmap.c index 112f3cff4..0cfbdaa23 100644 --- a/lib/libXmu/src/LocBitmap.c +++ b/lib/libXmu/src/LocBitmap.c @@ -1,5 +1,3 @@ -/* $Xorg: LocBitmap.c,v 1.7 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.9 2001/12/14 19:55:47 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/src/Lookup.c b/lib/libXmu/src/Lookup.c index 27676c1da..75b546df4 100644 --- a/lib/libXmu/src/Lookup.c +++ b/lib/libXmu/src/Lookup.c @@ -1,5 +1,3 @@ -/* $Xorg: Lookup.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.7 2001/01/17 19:42:56 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/LookupCmap.c b/lib/libXmu/src/LookupCmap.c index e7d7008e5..5756b83ec 100644 --- a/lib/libXmu/src/LookupCmap.c +++ b/lib/libXmu/src/LookupCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: LookupCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/libXmu/src/Lower.c b/lib/libXmu/src/Lower.c index 06ad31a29..4e44be148 100644 --- a/lib/libXmu/src/Lower.c +++ b/lib/libXmu/src/Lower.c @@ -1,5 +1,3 @@ -/* $Xorg: Lower.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lower.c,v 1.11 2001/07/25 15:04:50 dawes Exp $ */ - #define XK_LATIN1 #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/Makefile.in b/lib/libXmu/src/Makefile.in index 04aab9d91..aed8438d8 100644 --- a/lib/libXmu/src/Makefile.in +++ b/lib/libXmu/src/Makefile.in @@ -97,6 +97,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AR = @AR@ @@ -126,13 +127,25 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ GREP = @GREP@ HAS_SNPRINTF = @HAS_SNPRINTF@ +HAVE_FOP_FALSE = @HAVE_FOP_FALSE@ +HAVE_FOP_TRUE = @HAVE_FOP_TRUE@ +HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@ +HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@ +HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ +HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ +HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ +HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -157,6 +170,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@ MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NMEDIT = @NMEDIT@ @@ -174,11 +188,16 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ +XMLTO = @XMLTO@ XMUU_CFLAGS = @XMUU_CFLAGS@ XMUU_LIBS = @XMUU_LIBS@ XMU_CFLAGS = @XMU_CFLAGS@ XMU_LIBS = @XMU_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ @@ -199,7 +218,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -307,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/lib/libXmu/src/RdBitF.c b/lib/libXmu/src/RdBitF.c index 073e3dfbd..9402159b3 100644 --- a/lib/libXmu/src/RdBitF.c +++ b/lib/libXmu/src/RdBitF.c @@ -1,5 +1,3 @@ -/* $Xorg: RdBitF.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.12 2001/12/14 19:55:48 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/lib/libXmu/src/ScrOfWin.c b/lib/libXmu/src/ScrOfWin.c index dbba3c65b..b8fc09ad9 100644 --- a/lib/libXmu/src/ScrOfWin.c +++ b/lib/libXmu/src/ScrOfWin.c @@ -1,5 +1,3 @@ -/* $Xorg: ScrOfWin.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/src/ShapeWidg.c b/lib/libXmu/src/ShapeWidg.c index 732018c92..bb8c4fbb3 100644 --- a/lib/libXmu/src/ShapeWidg.c +++ b/lib/libXmu/src/ShapeWidg.c @@ -1,5 +1,3 @@ -/* $Xorg: ShapeWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/StdCmap.c b/lib/libXmu/src/StdCmap.c index 3fb3f25dd..5d2ce6160 100644 --- a/lib/libXmu/src/StdCmap.c +++ b/lib/libXmu/src/StdCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: StdCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.5 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/libXmu/src/StrToBS.c b/lib/libXmu/src/StrToBS.c index 79fbedda6..0dd0be519 100644 --- a/lib/libXmu/src/StrToBS.c +++ b/lib/libXmu/src/StrToBS.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToBS.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/lib/libXmu/src/StrToBmap.c b/lib/libXmu/src/StrToBmap.c index f46a99a1a..80df74bc7 100644 --- a/lib/libXmu/src/StrToBmap.c +++ b/lib/libXmu/src/StrToBmap.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToBmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.5 2001/01/17 19:42:57 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/StrToCurs.c b/lib/libXmu/src/StrToCurs.c index 7f13c0d4e..53d98f511 100644 --- a/lib/libXmu/src/StrToCurs.c +++ b/lib/libXmu/src/StrToCurs.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToCurs.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -50,8 +48,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.11 2002/09/19 13:21:58 tsi Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/lib/libXmu/src/StrToGrav.c b/lib/libXmu/src/StrToGrav.c index a0c99687c..8d86fe51d 100644 --- a/lib/libXmu/src/StrToGrav.c +++ b/lib/libXmu/src/StrToGrav.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToGrav.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/StrToJust.c b/lib/libXmu/src/StrToJust.c index f3b4b7828..03b38545d 100644 --- a/lib/libXmu/src/StrToJust.c +++ b/lib/libXmu/src/StrToJust.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToJust.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/lib/libXmu/src/StrToLong.c b/lib/libXmu/src/StrToLong.c index 6a7539aa9..c0663f5ce 100644 --- a/lib/libXmu/src/StrToLong.c +++ b/lib/libXmu/src/StrToLong.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToLong.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/StrToOrnt.c b/lib/libXmu/src/StrToOrnt.c index 209b13a19..0c41c116c 100644 --- a/lib/libXmu/src/StrToOrnt.c +++ b/lib/libXmu/src/StrToOrnt.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToOrnt.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/lib/libXmu/src/StrToShap.c b/lib/libXmu/src/StrToShap.c index 3f17c01e9..298c91522 100644 --- a/lib/libXmu/src/StrToShap.c +++ b/lib/libXmu/src/StrToShap.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToShap.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/StrToWidg.c b/lib/libXmu/src/StrToWidg.c index 190e91f56..c22b82764 100644 --- a/lib/libXmu/src/StrToWidg.c +++ b/lib/libXmu/src/StrToWidg.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * XmuCvtStringToWidget diff --git a/lib/libXmu/src/UpdMapHint.c b/lib/libXmu/src/UpdMapHint.c index aeba3037f..389b80213 100644 --- a/lib/libXmu/src/UpdMapHint.c +++ b/lib/libXmu/src/UpdMapHint.c @@ -1,5 +1,3 @@ -/* $Xorg: UpdMapHint.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/libXmu/src/VisCmap.c b/lib/libXmu/src/VisCmap.c index 54022cc9a..0a35713ba 100644 --- a/lib/libXmu/src/VisCmap.c +++ b/lib/libXmu/src/VisCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: VisCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/libXmu/src/WidgetNode.c b/lib/libXmu/src/WidgetNode.c index e157ccc10..ac6c9ec9d 100644 --- a/lib/libXmu/src/WidgetNode.c +++ b/lib/libXmu/src/WidgetNode.c @@ -1,5 +1,3 @@ -/* $Xorg: WidgetNode.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.12 2002/09/19 13:21:58 tsi Exp $ */ - /* * Author: Jim Fulton, MIT X Consortium */ diff --git a/lib/libXmu/src/Xct.c b/lib/libXmu/src/Xct.c index b186d27d7..1db470ebb 100644 --- a/lib/libXmu/src/Xct.c +++ b/lib/libXmu/src/Xct.c @@ -1,5 +1,3 @@ -/* $Xorg: Xct.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.c,v 1.8 2001/07/25 15:04:50 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/lib/libXmu/src/sharedlib.c b/lib/libXmu/src/sharedlib.c index 0ef5e3ce9..4bb8c3b5f 100644 --- a/lib/libXmu/src/sharedlib.c +++ b/lib/libXmu/src/sharedlib.c @@ -1,5 +1,3 @@ -/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.4 2001/07/25 15:04:51 dawes Exp $ */ #if defined(SUNSHLIB) && !defined(SHAREDCODE) |
