From f0e68d815c7c75bdbc044f4e11d482540baeb11e Mon Sep 17 00:00:00 2001 From: matthieu Date: Sun, 31 Oct 2010 20:32:53 +0000 Subject: [PATCH] Update to encodings 1.0.4 --- font/encodings/ChangeLog | 97 +++++++ font/encodings/INSTALL | 291 +++++++++++++++++++ font/encodings/Makefile.am | 12 +- font/encodings/Makefile.in | 22 +- font/encodings/aclocal.m4 | 289 +++++++++++++----- font/encodings/configure | 62 +++- font/encodings/configure.ac | 12 +- font/encodings/iso8859-6.8x.enc | 2 - font/encodings/large/Makefile.in | 9 +- font/encodings/large/big5.eten-0.enc | 1 - font/encodings/large/big5hkscs-0.enc | 2 - font/encodings/large/gb18030.2000-0.enc | 1 - font/encodings/large/gb18030.2000-1.enc | 1 - font/encodings/large/gb2312.1980-0.enc | 1 - font/encodings/large/gbk-0.enc | 1 - font/encodings/large/jisx0201.1976-0.enc | 1 - font/encodings/large/jisx0208.1990-0.enc | 1 - font/encodings/large/jisx0212.1990-0.enc | 1 - font/encodings/large/ksc5601.1987-0.enc | 1 - font/encodings/large/ksc5601.1992-3.enc | 1 - font/encodings/large/sun.unicode.india-0.enc | 1 - 21 files changed, 683 insertions(+), 126 deletions(-) create mode 100644 font/encodings/INSTALL diff --git a/font/encodings/ChangeLog b/font/encodings/ChangeLog index 3559b1482..002c8bd22 100644 --- a/font/encodings/ChangeLog +++ b/font/encodings/ChangeLog @@ -1,3 +1,100 @@ +commit 22a939832df60c2c0e9767ab26b4c82433aa1555 +Author: Alan Coopersmith +Date: Fri Oct 29 20:54:06 2010 -0700 + + encodings 1.0.4 + + Signed-off-by: Alan Coopersmith + +commit 44e5e3221239b3deae20a3220a62c26870da956c +Author: Gaetan Nadon +Date: Tue Jul 20 18:45:18 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 + +commit d47c71268417e255091d1a5585296be558b98c51 +Author: Gaetan Nadon +Date: Fri Oct 15 20:09:56 2010 -0400 + + config: Use the shorthand --disable-all-encodings option in font-util v1.2 + + This option is useful to disable all possible font encodings at once, + without fine-graining the calling ebuilds for a list of encodings + supported by each font package. + + The option is parsed before all other encoding options, so it basically + sets defaults for all of them. Afterwards, any encoding can be + re-enabled back using '--enable-' (much like + '--disable-all-encodings --enable-iso8859-2'). + + Reviewed-by: Rémi Cardona + + Signed-off-by: Gaetan Nadon + +commit 8101ff3418c04df3d0d6e82ce107ea2bdfb6c999 +Author: Jesse Adkins +Date: Tue Sep 28 13:29:57 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins + Signed-off-by: Alan Coopersmith + +commit 2bbe5d04111249f877cd152daebdd6140bffa1db +Author: Gaetan Nadon +Date: Sat Mar 27 10:46:07 2010 -0400 + + config: remove from ChangeLog from EXTRA_DIST + + Automake always distribute ChangeLog + + Signed-off-by: Gaetan Nadon + +commit 45bc91ff4fc6d104286a1dd8a925a360c5380b12 +Author: Gaetan Nadon +Date: Mon Nov 23 15:11:25 2009 -0500 + + Makefile.am: add INSTALL target and clean ChangeLog DIST targets + + Add INSTALL target to generate file with INSTALL_CMD #24206 + ChangeLog is not required in EXTRA_DIST #24432 + +commit e23f044d40a064aaf9436a5afb85083e4dfa39be +Author: Gaetan Nadon +Date: Mon Nov 23 15:03:12 2009 -0500 + + configure.ac: AM_MAINTAINER_MODE missing #24238 + + This turns off maintainer mode build rules in tarballs. + Works in conjunction with autogen.sh --enable-maintainer-mode + +commit f385c3c4d077f33b93e9b426b70d86ab63eead62 +Author: Gaetan Nadon +Date: Mon Nov 23 14:23:51 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 74eec8241bca833c4f9c20338ca74bc732f74e93 +Author: Gaetan Nadon +Date: Mon Nov 23 13:38:51 2009 -0500 + + .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 37d2a7c362a330d6aaa4d348a5db81da844ef7a8 Author: Alan Coopersmith Date: Sat Oct 10 17:56:53 2009 -0700 diff --git a/font/encodings/INSTALL b/font/encodings/INSTALL new file mode 100644 index 000000000..8b82ade08 --- /dev/null +++ b/font/encodings/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/font/encodings/Makefile.am b/font/encodings/Makefile.am index 4183d5659..04e57b12c 100644 --- a/font/encodings/Makefile.am +++ b/font/encodings/Makefile.am @@ -37,7 +37,9 @@ ENCODING_FILES = \ tis620-2.enc \ viscii1.1-1.enc -EXTRA_DIST = $(ENCODING_FILES) ChangeLog +EXTRA_DIST = $(ENCODING_FILES) + +MAINTAINERCLEANFILES = ChangeLog INSTALL COMPRESSED = $(ENCODING_FILES:%=%.gz) @@ -60,12 +62,12 @@ encodings.dir: $(DATA_FILES) encodings_DATA = $(DATA_FILES) encodings.dir -MAINTAINERCLEANFILES=ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - +dist-hook: ChangeLog INSTALL diff --git a/font/encodings/Makefile.in b/font/encodings/Makefile.in index c797c613e..890b68389 100644 --- a/font/encodings/Makefile.in +++ b/font/encodings/Makefile.in @@ -39,7 +39,7 @@ host_triplet = @host@ @GZIP_SMALL_TRUE@am__append_1 = $(COMPRESSED) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \ - ChangeLog config.guess config.sub install-sh missing + ChangeLog INSTALL config.guess config.sub install-sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -131,6 +131,9 @@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ @@ -231,21 +234,21 @@ ENCODING_FILES = \ tis620-2.enc \ viscii1.1-1.enc -EXTRA_DIST = $(ENCODING_FILES) ChangeLog +EXTRA_DIST = $(ENCODING_FILES) +MAINTAINERCLEANFILES = ChangeLog INSTALL COMPRESSED = $(ENCODING_FILES:%=%.gz) CLEANFILES = encodings.dir $(am__append_1) @GZIP_SMALL_FALSE@DATA_FILES = $(ENCODING_FILES) @GZIP_SMALL_TRUE@DATA_FILES = $(COMPRESSED) SUFFIXES = .enc .enc.gz encodings_DATA = $(DATA_FILES) encodings.dir -MAINTAINERCLEANFILES = ChangeLog all: all-recursive .SUFFIXES: .SUFFIXES: .enc .enc.gz am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -272,9 +275,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: install-encodingsDATA: $(encodings_DATA) @@ -679,12 +682,15 @@ uninstall-info: uninstall-info-recursive encodings.dir: $(DATA_FILES) $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large . -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL # 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/font/encodings/aclocal.m4 b/font/encodings/aclocal.m4 index 7cc75dca8..ac848e1c8 100644 --- a/font/encodings/aclocal.m4 +++ b/font/encodings/aclocal.m4 @@ -647,6 +647,35 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. @@ -956,7 +985,30 @@ AC_SUBST([am__untar]) dnl fontutil.m4. Generated from fontutil.m4.in by configure. dnl -dnl This file comes from X.Org's font-util 1.1.1 +dnl This file comes from X.Org's font-util 1.2.0 +dnl +dnl Copyright (c) 2009, 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 "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 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 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. +dnl +dnl -------------------------------------------------------------------- dnl dnl Copyright 2005 Red Hat, Inc dnl @@ -981,35 +1033,6 @@ dnl Except as contained in this notice, the name of the copyright holders shall dnl not be used in advertising or otherwise to promote the sale, use or dnl other dealings in this Software without prior written authorization dnl from the copyright holders. -dnl -dnl -------------------------------------------------------------------- -dnl -dnl Copyright 2009 Sun Microsystems, Inc. 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 -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 -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. # XORG_FONT_MACROS_VERSION(required-version) # ------------------------------------------ @@ -1027,7 +1050,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_FONT_MACROS_VERSION],[ -m4_define([vers_have], [1.1.1]) +m4_define([vers_have], [1.2.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,, @@ -1076,7 +1099,7 @@ AC_DEFUN([XORG_FONT_CHECK_ENCODING],[ AC_ARG_ENABLE(m4_tolower($1), AS_HELP_STRING(m4_join([-], [--disable], m4_tolower($1)), [Build $1 fonts (default: yes)]), - [AS_TR_SH($1)=$enableval], [AS_TR_SH($1)=yes]) + [AS_TR_SH($1)=$enableval]) AC_MSG_CHECKING([whether to build $1 fonts]) AC_MSG_RESULT($[AS_TR_SH($1)]) AM_CONDITIONAL(AS_TR_SH($1), [test "x$AS_TR_SH($1)" = xyes]) @@ -1085,9 +1108,19 @@ AC_DEFUN([XORG_FONT_CHECK_ENCODING],[ # XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....) # ----------------------------------------------------- # Minimum version: 1.1.0 -# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once +# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once. +# Add a shorthand --enable/disable-all-encodings option. AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[ + AC_ARG_ENABLE([all-encodings], + AS_HELP_STRING([--disable-all-encodings], + [Disable building of all font encodings]), + [m4_foreach_w([enc], [$1], [ + AS_TR_SH(enc)=$enableval + ])], + [m4_foreach_w([enc], [$1], [ + AS_TR_SH(enc)=yes + ])]) m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)]) ]) # XORG_FONT_CHECK_ENCODING_LIST @@ -1100,7 +1133,7 @@ AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[ AC_DEFUN([XORG_FONT_REQUIRED_PROG],[ AC_PATH_PROG($1, $2) - if test x"$1" = x; then + if test x"$$1" = x; then AC_MSG_ERROR([$2 is required to build $PACKAGE_NAME.]) fi ]) @@ -1218,6 +1251,40 @@ AC_DEFUN([XORG_FONT_UCS2ANY],[ +# XORG_FONT_FC_CONFDIR() +# -------------------- +# Minimum version: 1.2.0 +# +# Sets FC_CONFDIR to the fontconfig config directory +# (which should be --with-confdir=... when building fontconfig) +# found from: +# --with-fc-confdir=... +# pkg-config --variable=confdir fontconfig +# ${sysconfdir}/fonts + +AC_DEFUN([XORG_FONT_FC_CONFDIR],[ + dnl Ensure $PKG_CONFIG is set first + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + AC_MSG_CHECKING([for fontconfig's configuration directory]) + AC_ARG_WITH(fc-confdir, + AS_HELP_STRING([--with-fc-confdir=DIR], + [Path to fontconfig's configuration directory]), + [FC_CONFDIR="$withval"]) + # if --with-fc-confdir was not specified + if test "x${FC_CONFDIR}" = "x"; then + FC_CONFDIR=`$PKG_CONFIG --variable=confdir fontconfig` + fi + # ...and if pkg-config didn't find confdir in fontconfig.pc... + if test "x${FC_CONFDIR}" = "x"; then + FC_CONFDIR="${sysconfdir}/fonts" + fi + AC_SUBST(FC_CONFDIR) + AC_MSG_RESULT([${FC_CONFDIR}]) +]) + + + # XORG_FONTROOTDIR() # -------------------- # Minimum version: 1.1.0 @@ -1281,7 +1348,7 @@ AC_DEFUN([XORG_FONTDIR],[XORG_FONTSUBDIR([FONTDIR], [fontdir], [$1])]) 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 "Software"), @@ -1318,7 +1385,7 @@ dnl DEALINGS IN THE SOFTWARE. # 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.8.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,, @@ -1469,6 +1536,7 @@ MAN_SUBSTS="\ -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' \ @@ -1497,13 +1565,20 @@ PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])], 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 @@ -1619,15 +1694,17 @@ AC_SUBST(MAKE_PDF) AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK -# XORG_WITH_XMLTO([MIN-VERSION]) +# 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. +# 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 @@ -1636,14 +1713,20 @@ AC_SUBST(MAKE_HTML) # --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: yes, if installed)]), - [use_xmlto=$withval], [use_xmlto=auto]) + [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]) @@ -1667,6 +1750,8 @@ elif test "x$use_xmlto" = x"no" ; then 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 @@ -1681,18 +1766,31 @@ m4_ifval([$1], 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]) +# 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. +# 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 @@ -1705,10 +1803,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) # 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: yes, if installed)]), - [use_asciidoc=$withval], [use_asciidoc=auto]) + [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]) @@ -1749,15 +1849,17 @@ fi]) AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) ]) # XORG_WITH_ASCIIDOC -# XORG_WITH_DOXYGEN([MIN-VERSION]) +# 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. +# 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 @@ -1770,10 +1872,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) # 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: yes, if installed)]), - [use_doxygen=$withval], [use_doxygen=auto]) + [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]) @@ -1814,15 +1918,17 @@ fi]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) ]) # XORG_WITH_DOXYGEN -# XORG_WITH_GROFF +# 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. +# 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 @@ -1833,6 +1939,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # --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 @@ -1845,10 +1957,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # 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: yes, if installed)]), - [use_groff=$withval], [use_groff=auto]) + [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]) @@ -1872,6 +1986,7 @@ elif test "x$use_groff" = x"no" ; then 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]) @@ -1889,20 +2004,38 @@ if test "x$have_groff" = x"yes"; then 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 +# 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. +# 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 @@ -1915,10 +2048,12 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) # 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: yes, if installed)]), - [use_fop=$withval], [use_fop=auto]) + [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]) @@ -1945,15 +2080,17 @@ fi AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP -# XORG_WITH_PS2PDF +# 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. +# 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 @@ -1966,10 +2103,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) # 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: yes, if installed)]), - [use_ps2pdf=$withval], [use_ps2pdf=auto]) + [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]) @@ -2020,14 +2159,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -default=$1 -if test "x$default" = x ; then - default="yes" -fi +m4_define([default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: yes)]), - [build_docs=$enableval], [build_docs=$default]) + [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]) @@ -2055,14 +2192,12 @@ AC_MSG_RESULT([$build_docs]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ -devel_default=$1 -if test "x$devel_default" = x ; then - devel_default="yes" -fi +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: yes)]), - [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) + [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]) @@ -2090,14 +2225,12 @@ AC_MSG_RESULT([$build_devel_docs]) # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_SPECS],[ -spec_default=$1 -if test "x$spec_default" = x ; then - spec_default="yes" -fi +m4_define([spec_default], m4_default([$1], [yes])) AC_ARG_ENABLE(specs, AS_HELP_STRING([--enable-specs], - [Enable building the specs (default: yes)]), - [build_specs=$enableval], [build_specs=$spec_default]) + [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]) diff --git a/font/encodings/configure b/font/encodings/configure index 43fa142f6..2f5175981 100644 --- a/font/encodings/configure +++ b/font/encodings/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for encodings 1.0.3. +# Generated by GNU Autoconf 2.62 for encodings 1.0.4. # # Report bugs to . # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='encodings' PACKAGE_TARNAME='encodings' -PACKAGE_VERSION='1.0.3' -PACKAGE_STRING='encodings 1.0.3' +PACKAGE_VERSION='1.0.4' +PACKAGE_STRING='encodings 1.0.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -694,6 +694,9 @@ am__leading_dot AMTAR am__tar am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT CC CFLAGS LDFLAGS @@ -754,6 +757,7 @@ LTLIBOBJS' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_maintainer_mode enable_dependency_tracking enable_strict_compilation enable_gzip_small_encodings @@ -1323,7 +1327,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 encodings 1.0.3 to adapt to many kinds of systems. +\`configure' configures encodings 1.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of encodings 1.0.3:";; + short | recursive ) echo "Configuration of encodings 1.0.4:";; esac cat <<\_ACEOF @@ -1401,6 +1405,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-strict-compilation @@ -1494,7 +1500,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -encodings configure 1.0.3 +encodings configure 1.0.4 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1508,7 +1514,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 encodings $as_me 1.0.3, which was +It was created by encodings $as_me 1.0.4, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2157,7 +2163,7 @@ fi # Define the identity of the package. PACKAGE='encodings' - VERSION='1.0.3' + VERSION='1.0.4' cat >>confdefs.h <<_ACEOF @@ -2303,6 +2309,30 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + # Require xorg-macros: XORG_DEFAULT_OPTIONS @@ -4859,6 +4889,7 @@ MAN_SUBSTS="\ -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' \ @@ -4966,7 +4997,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 or later @@ -5021,7 +5052,7 @@ $as_echo "no" >&6; } fi - if test x"MKFONTSCALE" = x; then + if test x"$MKFONTSCALE" = x; then { { $as_echo "$as_me:$LINENO: error: mkfontscale is required to build $PACKAGE_NAME." >&5 $as_echo "$as_me: error: mkfontscale is required to build $PACKAGE_NAME." >&2;} { (exit 1); exit 1; }; } @@ -5300,6 +5331,13 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -5650,7 +5688,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 encodings $as_me 1.0.3, which was +This file was extended by encodings $as_me 1.0.4, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5697,7 +5735,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -encodings config.status 1.0.3 +encodings config.status 1.0.4 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/font/encodings/configure.ac b/font/encodings/configure.ac index 43bfa1556..829326b15 100644 --- a/font/encodings/configure.ac +++ b/font/encodings/configure.ac @@ -1,6 +1,8 @@ -AC_PREREQ([2.57]) -AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_PREREQ([2.60]) +AC_INIT([encodings], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -10,10 +12,10 @@ XORG_DEFAULT_OPTIONS AC_PROG_INSTALL -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 or later m4_ifndef([XORG_FONT_MACROS_VERSION], - [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.1) + [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.2) # mkfontscale XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale) diff --git a/font/encodings/iso8859-6.8x.enc b/font/encodings/iso8859-6.8x.enc index f5bb047b1..3e66157ec 100644 --- a/font/encodings/iso8859-6.8x.enc +++ b/font/encodings/iso8859-6.8x.enc @@ -7,8 +7,6 @@ STARTENCODING iso8859-6.8x # - http://www.langbox.com/arabic/FontSet_ISO8859-6-8X.html # - http://bugs.xfree86.org/show_bug.cgi?id=420 # - http://bugzilla.mozilla.org/show_bug.cgi?id=78201 -# $XdotOrg: xc/fonts/encodings/iso8859-6.8x.enc,v 1.2 2003/12/08 15:35:04 dawes Exp $ -# $XFree86$ STARTMAPPING unicode UNDEFINE 0x00 0xFF 0x8D 0xFEEF diff --git a/font/encodings/large/Makefile.in b/font/encodings/large/Makefile.in index 854fa1fe7..b86255b58 100644 --- a/font/encodings/large/Makefile.in +++ b/font/encodings/large/Makefile.in @@ -108,6 +108,9 @@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ @@ -201,7 +204,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .enc .enc.gz -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -226,9 +229,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: install-encodingsDATA: $(encodings_DATA) diff --git a/font/encodings/large/big5.eten-0.enc b/font/encodings/large/big5.eten-0.enc index 725769bb0..6f59494cc 100644 --- a/font/encodings/large/big5.eten-0.enc +++ b/font/encodings/large/big5.eten-0.enc @@ -2,7 +2,6 @@ STARTENCODING big5.eten-0 ALIAS big5-0 ALIAS big5.cp950-0 # This file is generated from glibc-2.2 BIG5 charmap -# $XFree86: xc/fonts/encodings/large/big5.eten-0.enc,v 1.5 2001/09/26 12:48:19 alanh Exp $ SIZE 0xFA 0xFF FIRSTINDEX 0xA1 0x40 STARTMAPPING unicode diff --git a/font/encodings/large/big5hkscs-0.enc b/font/encodings/large/big5hkscs-0.enc index 7fd1e03be..812b02f67 100644 --- a/font/encodings/large/big5hkscs-0.enc +++ b/font/encodings/large/big5hkscs-0.enc @@ -2,8 +2,6 @@ STARTENCODING big5hkscs-0 # This file is generated from Anthony Fok's () # http://www.thizlinux.com/~anthony/hkscs/Correct-Big5HKSCS-to-Unicode-by-b5.txt # by Jungshik Shin -# $XFree86: xc/fonts/encodings/large/big5hkscs-0.enc,v 1.1 2003/08/26 11:34:53 eich Exp $ -# $XdotOrg: xc/fonts/encodings/large/big5hkscs-0.enc,v 1.2 2004/04/23 18:43:03 eich Exp $ SIZE 0xFF 0xFF FIRSTINDEX 0x81 0x40 STARTMAPPING unicode diff --git a/font/encodings/large/gb18030.2000-0.enc b/font/encodings/large/gb18030.2000-0.enc index 0476e51b6..6a4fa15d3 100644 --- a/font/encodings/large/gb18030.2000-0.enc +++ b/font/encodings/large/gb18030.2000-0.enc @@ -1,5 +1,4 @@ # Contributed by James Su -# $XFree86$ STARTENCODING gb18030.2000-0 SIZE 0xFF 0xFF FIRSTINDEX 0x81 0x40 diff --git a/font/encodings/large/gb18030.2000-1.enc b/font/encodings/large/gb18030.2000-1.enc index 761a5495a..beac78c75 100644 --- a/font/encodings/large/gb18030.2000-1.enc +++ b/font/encodings/large/gb18030.2000-1.enc @@ -1,5 +1,4 @@ # Contributed by James Su -# $XFree86$ STARTENCODING gb18030.2000-1 SIZE 0x9A 0x100 STARTMAPPING unicode diff --git a/font/encodings/large/gb2312.1980-0.enc b/font/encodings/large/gb2312.1980-0.enc index 337a3a58d..2aff9bf38 100644 --- a/font/encodings/large/gb2312.1980-0.enc +++ b/font/encodings/large/gb2312.1980-0.enc @@ -1,5 +1,4 @@ STARTENCODING gb2312.1980-0 -# $XFree86$ SIZE 0x78 0x7F FIRSTINDEX 0x20 0x20 STARTMAPPING unicode diff --git a/font/encodings/large/gbk-0.enc b/font/encodings/large/gbk-0.enc index 81e3dad0b..99ed377d5 100644 --- a/font/encodings/large/gbk-0.enc +++ b/font/encodings/large/gbk-0.enc @@ -1,5 +1,4 @@ STARTENCODING gbk-0 -# $XFree86: xc/fonts/encodings/large/gbk-0.enc,v 1.2 2002/09/27 02:04:21 dawes Exp $ SIZE 0xFF 0xFF FIRSTINDEX 0x80 0x40 STARTMAPPING unicode diff --git a/font/encodings/large/jisx0201.1976-0.enc b/font/encodings/large/jisx0201.1976-0.enc index a6efc25a2..915d50cac 100644 --- a/font/encodings/large/jisx0201.1976-0.enc +++ b/font/encodings/large/jisx0201.1976-0.enc @@ -1,5 +1,4 @@ STARTENCODING jisx0201.1976-0 -# $XFree86$ SIZE 0xE0 STARTMAPPING cmap 3 1 0x00A1 0xFF61 diff --git a/font/encodings/large/jisx0208.1990-0.enc b/font/encodings/large/jisx0208.1990-0.enc index d06caf1a5..1f7dc87e8 100644 --- a/font/encodings/large/jisx0208.1990-0.enc +++ b/font/encodings/large/jisx0208.1990-0.enc @@ -2,7 +2,6 @@ STARTENCODING jisx0208.1990-0 ALIAS jisx0208.1983-0 # This file is partly derived from data provided by the Unicode Consortium # Original data Copyright (c) 1991-1994 Unicode, Inc. -# $XFree86: xc/fonts/encodings/large/jisx0208.1990-0.enc,v 1.4 2003/11/02 04:30:55 dawes Exp $ SIZE 0x75 0x7f FIRSTINDEX 0x21 0x21 STARTMAPPING cmap 3 1 diff --git a/font/encodings/large/jisx0212.1990-0.enc b/font/encodings/large/jisx0212.1990-0.enc index d12048bbe..2a19599ea 100644 --- a/font/encodings/large/jisx0212.1990-0.enc +++ b/font/encodings/large/jisx0212.1990-0.enc @@ -1,5 +1,4 @@ STARTENCODING jisx0212.1990-0 -# $XFree86$ SIZE 0x6E 0x80 FIRSTINDEX 0x20 0x20 STARTMAPPING unicode diff --git a/font/encodings/large/ksc5601.1987-0.enc b/font/encodings/large/ksc5601.1987-0.enc index 43c77e2a5..1c67da5b4 100644 --- a/font/encodings/large/ksc5601.1987-0.enc +++ b/font/encodings/large/ksc5601.1987-0.enc @@ -1,6 +1,5 @@ STARTENCODING ksc5601.1987-0 # This file is partially derived from data provided by the Unicode consortium -# $XFree86: xc/fonts/encodings/large/ksc5601.1987-0.enc,v 1.4 2001/12/24 23:17:15 dawes Exp $ ALIAS ksx1001.1998-0 ALIAS ksx1001.1997-0 SIZE 0x7E 0x80 diff --git a/font/encodings/large/ksc5601.1992-3.enc b/font/encodings/large/ksc5601.1992-3.enc index 10c2d3b91..00757d64f 100644 --- a/font/encodings/large/ksc5601.1992-3.enc +++ b/font/encodings/large/ksc5601.1992-3.enc @@ -3,7 +3,6 @@ STARTENCODING ksc5601.1992-3 # at ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT. # The up-to-date mapping table JOHAB.TXT with two new characters # is available at http://jshin.net/faq/JOHAB.TXT.gz. -# $XFree86: xc/fonts/encodings/large/ksc5601.1992-3.enc,v 1.1 2001/11/02 03:06:39 dawes Exp $ ALIAS ksx1001.1998-3 ALIAS ksxjohab-1 SIZE 0xFA 0xFF diff --git a/font/encodings/large/sun.unicode.india-0.enc b/font/encodings/large/sun.unicode.india-0.enc index f4c8c22da..8400f88d8 100644 --- a/font/encodings/large/sun.unicode.india-0.enc +++ b/font/encodings/large/sun.unicode.india-0.enc @@ -1,4 +1,3 @@ -# $XFree86: xc/fonts/encodings/large/sun.unicode.india-0.enc,v 1.1 2003/12/07 18:20:11 dawes Exp $ STARTENCODING sun.unicode.india-0 SIZE 0xF8 0x100 FIRSTINDEX 0x00 0x20