qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to font-util 1.1.1

Browse Source
This commit is contained in:
matthieu 2010-05-31 19:26:22 +00:00
parent 1d28555472
commit c91db26221
17 changed files with 6785 additions and 2662 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
font/util/COPYING
View File

@ -12,9 +12,6 @@ are met:
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of The NetBSD Foundation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@ -27,3 +24,103 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------
Copyright (c) 2006 Martin Husemann.
Copyright (c) 2007 Joerg Sonnenberger.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. The name of the author may not be used to endorse or promote
products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------
Copyright 2005 Red Hat, Inc
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice 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 OPEN GROUP 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.
Except as contained in this notice, the name of the copyright holders 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 copyright holders.
------------------------------------------------------------------------
Copyright (c) 1991-2003 Unicode, Inc. All Rights reserved.
This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
No claims are made as to fitness for any particular purpose. No
warranties of any kind are expressed or implied. The recipient
agrees to determine applicability of information provided. If this
file has been provided on optical media by Unicode, Inc., the sole
remedy for any claim will be exchange of defective media within 90
days of receipt.
Unicode, Inc. hereby grants the right to freely use the information
supplied in this file in the creation of products supporting the
Unicode Standard, and to make copies of this file in any form for
internal or external distribution as long as this notice remains
attached.
------------------------------------------------------------------------
Copyright 2009 Sun Microsystems, Inc. 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, and/or sell copies of the Software, and to permit persons
to whom the Software is furnished to do so, provided that the above
copyright notice(s) and this permission notice appear in all copies of
the Software and that both the above copyright notice(s) and this
permission notice appear in supporting documentation.
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
OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Except as contained in this notice, the name of a copyright holder
shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
of the copyright holder.

340
font/util/ChangeLog
View File

@ -1,48 +1,324 @@
2006-05-15 Adam Jackson <ajax@freedesktop.org>
commit 640a11b930dde29a5a74bcecec858d0a8255c013
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 12 08:49:02 2009 -0700
* configure.ac:
Bump to 1.0.1
font-util 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2006-02-17 Alan Coopersmith <alan.coopersmith@sun.com>
commit e1a84f5c30de633767dc4c05a38a34c3f114a138
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Oct 10 21:50:26 2009 -0700
* ucs2any.c:
* COPYING:
Sync license statement with NetBSD, which has removed advertising
clause from original NetBSD license. (See
http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/xsrc/xfree/xc/fonts/util/ucs2any.c?rev=1.9&content-type=text/plain and
http://www.mail-archive.com/devel%40xfree86.org/msg07685.html )
Make fontrootdir capitalization consistently lowercase
Fixes installation of mapfiles, which were going to /util because
${fontrootdir} was undefined in Makefile. Found by tinderbox.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit b10044e1cdb8f1656b6f61d79512bf4d49ee3339
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 7 20:23:36 2009 -0700
* configure.ac:
Update package version number for final X11R7 release candidate.
font-util 1.1.0: Add new macros to replace code common to many font modules
XORG_FONT_MACROS_VERSION(required-version)
XORG_FONT_CHECK_ENCODING(encoding)
XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....)
XORG_FONT_REQUIRED_PROG(VARNAME, progname)
XORG_FONT_FCCACHE()
XORG_FONT_COMMON_UTILS()
XORG_FONT_BDF_UTILS()
XORG_FONT_SCALED_UTILS()
XORG_FONT_CHECK_COMPRESSION()
XORG_FONT_UCS2ANY()
XORG_FONTROOTDIR()
XORG_FONTSUBDIR(variable, flag, subdir)
XORG_FONTDIR(subdir)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Rémi Cardona <remi@gentoo.org>
2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 59557a6f4a28f38edcb6251ac04c9cb0e582bb3e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 6 14:19:57 2009 -0700
* Makefile.am:
* configure.ac:
* fontutil.pc.in:
Bug #5175: Make mapdir configurable (David Coulthart and Donnie
Berkholz).
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 032e3cb6c41c720412ab3403dad2ab800f45a817
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 23 23:12:08 2009 -0700
* Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Fix parsing of hexadecimal arguments to bdftruncate
Since bdftruncate suggests running itself with "0x3200", that should work.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit ca16bc230e73bfbf651acb9010ba695bbbef0e8a
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 7 21:47:25 2009 +0200
* configure.ac:
Update package version number for X11R7 RC3 release.
Bump to 1.0.2
2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit b0e27b7935e8f5f9ad3dd7b6fd77b8a38aa7d1d0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 19 18:22:31 2009 -0800
* Makefile.am:
* fontutil.m4:
Add configure option macro to disable ISO8859-* fonts.
Add README with pointers to mailing list, bugzilla & git repos
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit db703deee7cbfca5b12f4666229136a54554ec98
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 19 18:20:14 2009 -0800
* configure.ac:
Update package version number for RC1 release.
Add missing copyright/license notices to COPYING
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0678b945e4f382c45048e3d1a9739282d506b47e
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 19:11:08 2009 -0200
Janitor: Correct make distcheck and configure.ac simplification
commit de26fc14c3e5ecc24f4fbdf0c83d57f5974ed802
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 24 14:28:27 2008 -0700
Update license of code copyrighted by the NetBSD Foundation
As per http://mail-index.netbsd.org/netbsd-announce/2008/06/20/msg000030.html
dropped the endorsement clause and verified remaining text matches current
NetBSD Foundation license.
commit 2defe2544aeaeea00e41a2dca18b1f5ec0ca85e0
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:07 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit fb486bb1a5038912d064291b12c7aef5da3d8b63
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Dec 3 16:42:39 2007 -0500
Replace bdftruncate Perl script with C program
From bugzilla bug 13465¹:
[This] is a replacement for the bdftruncate program, which removes
the only runtime dependency on Perl in modular Xorg.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13465
Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
commit cedfe304041ecfc43cfcf2b44699efb53fc6aa5c
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:24 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit cff602a576aada75140b6cf13f1532218959189d
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:26:51 2007 -0400
Rename .cvsignore to .gitignore
commit 7e2dfd48d78c008d8afd56828bf0db8a025f417a
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri May 19 18:35:15 2006 +0000
Bump to 1.0.1
commit 449004af4c7023511471db479b58c547270805e5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Feb 17 15:59:48 2006 +0000
Update license copy in COPYING file too.
commit d36e97caf2141939cbd516d9f7802bb704f13f22
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Feb 17 15:58:37 2006 +0000
Sync license statement with NetBSD, which has removed advertising clause
from original NetBSD license. (See
http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/xsrc/xfree/xc/fonts/util
/ucs2any.c?rev=1.9&content-type=text/plain and
http://www.mail-archive.com/devel%40xfree86.org/msg07685.html )
commit 778c667cf5dc67a53996e0196a7394dbd41426a3
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:26 2005 +0000
Update package version number for final X11R7 release candidate.
commit 25ea9d0868ecf3dccfbac5a82c659b852fb61d0e
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 9 05:56:52 2005 +0000
Bug #5175: Make mapdir configurable (David Coulthart and Donnie Berkholz).
commit 3fc66a4a7e844d96c478ff35673ba6bbcd99df0a
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:41 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 19a7b8a70f3cfac4dbc652cc918deefba2380700
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:41 2005 +0000
Update package version number for X11R7 RC3 release.
commit 092577dbc7f5fe59bbec80b29f42bacb73844fa7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:07:21 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 27506bc355dd88c2ca8b3e14c8158dfb5d6e53b6
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 22 02:00:22 2005 +0000
Add .cvsignores for fonts.
commit c9e22d273e7b8df6ffa1224978d0a6877b57c626
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 15 08:27:53 2005 +0000
Add configure option macro to disable ISO8859-* fonts.
commit cb284d5e05a4d62b070bb94624c2fb32c322e40d
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:08 2005 +0000
Update package version number for RC1 release.
commit e096b243bb3be6a41bd928016d24acfe2cae677e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 22:20:58 2005 +0000
Use sed to replace variables in man pages
commit f45a6a9b5d53d91aec9ca0381311f5b0a4842c07
Author: Kevin E Martin <kem@kem.org>
Date: Tue Oct 4 23:12:28 2005 +0000
Use CLEANFILES so that bdftruncate is rebuilt after make clean
commit dd8c1045a1432cc31a7419eb45905282f3f065ea
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:49 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit be020c6e52a9f087493122a59721366e3a2417f2
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 27 19:53:18 2005 +0000
Fix typo
commit 854ba0573bbed8632f5a8adf93a497874e451d98
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 22 04:13:44 2005 +0000
Fix distcheck for fonts with multiple encodings
commit ae573de21851d1e3ed27bc499ccff396cf9d4067
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jul 15 12:39:39 2005 +0000
use bin_SCRIPTS for bdftruncate remove $(EXEEXT) from bdftruncate rule fix
bdftruncate rule to work with separate $(srcdir)
commit 5b1ba00aa310ddac6fae4ba4bb50763e9fe7a292
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jul 15 01:15:35 2005 +0000
Replace $< with portable construct
commit 70e2335cc8e9f1c377a70880696ee2d83558456e
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jun 30 22:28:08 2005 +0000
Initial build system files for font module
commit 8dbbdb2b6491edd6a0ec957d3a742802d2946fa3
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sun Nov 28 19:06:20 2004 +0000
Updated 8859-7.TXT to ISO 8859-7:2003 (with euro sign) Updated obsolete
email address
commit 5622b3c34465c8f7f83fe9fbab897fc7b438ef81
Author: Egbert Eich <eich@suse.de>
Date: Thu Aug 26 11:58:06 2004 +0000
Fixed support for LynxOS 3.1 (LynxOS 4 will follow) (Thomas Mueller).
2
commit edf6e4ce161fbf36a294f0947add0993bce2def6
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:43:05 2004 +0000
Merging XORG-CURRENT into trunk
commit efdd203d3b3f68f463b9aaf31ef60dd58170c327
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:31:32 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit cada8e174bc996c693440605bc4778390a2525b4
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:10:53 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit f5f59905ca85472432f99a82502e47827647cbd7
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:11 2004 +0000
readding XFree86's cvs IDs
commit 58fcd5a2cdba17e073e857283624d539758910a0
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:22:24 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit c653490dc1a7fe5dbd4437800832474c2f3ddefd
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:01 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit a3557f2e82e07580a5f7ceb41c49809a001b73e5
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:01 2003 +0000
Initial revision
commit ea7d5c737a21afcb846d4aeceb8741a44d7001da
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:42 2003 +0000
XFree86 4.3.0.1
commit 731ff0ca425ebc6b780199c58f11a63f24103567
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:42 2003 +0000
Initial revision

24
font/util/Makefile.am
View File

@ -19,14 +19,12 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
bin_PROGRAMS = ucs2any
bin_SCRIPTS = bdftruncate
bin_PROGRAMS = bdftruncate ucs2any
AM_CFLAGS = $(CWARNFLAGS)
ucs2any_SOURCES = ucs2any.c
bdftruncate: $(top_srcdir)/bdftruncate.pl
@rm -f $@
cp $(top_srcdir)/bdftruncate.pl $@
bdftruncate_SOURCES = bdftruncate.c
aclocaldir = $(datadir)/aclocal
aclocal_DATA = fontutil.m4
@ -62,8 +60,6 @@ CLEANFILES = bdftruncate $(appman_DATA)
EXTRA_DIST = $(mapfiles_DATA) \
$(appman_PRE) \
autogen.sh \
bdftruncate.pl \
fontutil.pc.in \
$(aclocal_DATA)
@ -80,4 +76,14 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

4
font/util/Makefile.bsd-wrapper
View File

@ -1,3 +1,5 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 17:37:04 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2010/05/31 19:26:22 matthieu Exp $
CONFIGURE_ARGS= --with-fontrootdir=${X11BASE}/lib/X11/fonts
.include <bsd.xorg.mk>

126
font/util/Makefile.in
View File

@ -36,7 +36,6 @@
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@ -59,12 +58,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = ucs2any$(EXEEXT)
bin_PROGRAMS = bdftruncate$(EXEEXT) ucs2any$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/fontutil.pc.in $(top_srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
install-sh missing
$(srcdir)/fontutil.m4.in $(srcdir)/fontutil.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
config.guess config.sub depcomp install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -74,17 +73,18 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = fontutil.pc
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(appmandir)" \
"$(DESTDIR)$(mapfilesdir)" "$(DESTDIR)$(pkgconfigdir)"
CONFIG_CLEAN_FILES = fontutil.m4 fontutil.pc
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" \
"$(DESTDIR)$(appmandir)" "$(DESTDIR)$(mapfilesdir)" \
"$(DESTDIR)$(pkgconfigdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_bdftruncate_OBJECTS = bdftruncate.$(OBJEXT)
bdftruncate_OBJECTS = $(am_bdftruncate_OBJECTS)
bdftruncate_LDADD = $(LDADD)
am_ucs2any_OBJECTS = ucs2any.$(OBJEXT)
ucs2any_OBJECTS = $(am_ucs2any_OBJECTS)
ucs2any_LDADD = $(LDADD)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -92,8 +92,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ucs2any_SOURCES)
DIST_SOURCES = $(ucs2any_SOURCES)
SOURCES = $(bdftruncate_SOURCES) $(ucs2any_SOURCES)
DIST_SOURCES = $(bdftruncate_SOURCES) $(ucs2any_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -125,6 +125,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@
AUTOCONF = @AUTOCONF@
@ -134,7 +135,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@ -143,9 +147,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -171,12 +178,12 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@ -191,29 +198,38 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
fontrootdir = @fontrootdir@
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@
bin_SCRIPTS = bdftruncate
AM_CFLAGS = $(CWARNFLAGS)
ucs2any_SOURCES = ucs2any.c
bdftruncate_SOURCES = bdftruncate.c
aclocaldir = $(datadir)/aclocal
aclocal_DATA = fontutil.m4
mapfilesdir = @MAPDIR@
@ -242,13 +258,8 @@ appmandir = $(APP_MAN_DIR)
appman_PRE = bdftruncate.man ucs2any.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = bdftruncate $(appman_DATA)
EXTRA_DIST = $(mapfiles_DATA) \
$(appman_PRE) \
autogen.sh \
bdftruncate.pl \
fontutil.pc.in \
$(aclocal_DATA)
EXTRA_DIST = $(mapfiles_DATA) $(appman_PRE) fontutil.pc.in \
$(aclocal_DATA) ChangeLog
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@ -259,6 +270,7 @@ MAN_SUBSTS = \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@ -314,6 +326,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
fontutil.m4: $(top_builddir)/config.status $(srcdir)/fontutil.m4.in
cd $(top_builddir) && $(SHELL) ./config.status $@
fontutil.pc: $(top_builddir)/config.status $(srcdir)/fontutil.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-binPROGRAMS: $(bin_PROGRAMS)
@ -339,28 +353,12 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
bdftruncate$(EXEEXT): $(bdftruncate_OBJECTS) $(bdftruncate_DEPENDENCIES)
@rm -f bdftruncate$(EXEEXT)
$(LINK) $(bdftruncate_LDFLAGS) $(bdftruncate_OBJECTS) $(bdftruncate_LDADD) $(LIBS)
ucs2any$(EXEEXT): $(ucs2any_OBJECTS) $(ucs2any_DEPENDENCIES)
@rm -f ucs2any$(EXEEXT)
$(LINK) $(ucs2any_LDFLAGS) $(ucs2any_OBJECTS) $(ucs2any_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
$(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
else :; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@ -368,6 +366,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdftruncate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ucs2any.Po@am__quote@
.c.o:
@ -531,6 +530,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -630,9 +632,9 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(mapfilesdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(mapfilesdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@ -660,6 +662,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -684,7 +687,7 @@ info-am:
install-data-am: install-aclocalDATA install-appmanDATA \
install-mapfilesDATA install-pkgconfigDATA
install-exec-am: install-binPROGRAMS install-binSCRIPTS
install-exec-am: install-binPROGRAMS
install-info: install-info-am
@ -712,33 +715,36 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-aclocalDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
uninstall-mapfilesDATA uninstall-pkgconfigDATA
uninstall-binPROGRAMS uninstall-info-am uninstall-mapfilesDATA \
uninstall-pkgconfigDATA
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-aclocalDATA \
install-am install-appmanDATA install-binPROGRAMS \
install-binSCRIPTS install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-mapfilesDATA install-pkgconfigDATA install-strip \
installcheck installcheck-am installdirs maintainer-clean \
install-am install-appmanDATA install-binPROGRAMS install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-mapfilesDATA \
install-pkgconfigDATA install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-aclocalDATA uninstall-am uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
uninstall-mapfilesDATA uninstall-pkgconfigDATA
uninstall-binPROGRAMS uninstall-info-am uninstall-mapfilesDATA \
uninstall-pkgconfigDATA
bdftruncate: $(top_srcdir)/bdftruncate.pl
@rm -f $@
cp $(top_srcdir)/bdftruncate.pl $@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# 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:

30
font/util/README
View File

@ -0,0 +1,30 @@
X.Org font package creation/installation utilities
If the --with-fontrootdir option is specified when configuring this
package, it will be recorded in the fontutil pkg-config file to be used
as the default parent directory for font modules built using the fontutil
macros from version 1.1 or later of this package.
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
Please submit bug reports to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/font/util
http://cgit.freedesktop.org/xorg/font/util
For patch submission instructions, see:
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage

859
font/util/aclocal.m4 vendored
View File

@ -11,6 +11,164 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
#
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
# this or PKG_CHECK_MODULES is called, or make sure to call
# PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
if test -n "$$1"; then
pkg_cv_[]$1="$$1"
else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED
# -----------------------------
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT
])],
[AC_MSG_RESULT([no])
$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@ -837,33 +995,28 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
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
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)
# -------------------------------------
@ -873,27 +1026,24 @@ dnl of the copyright holder.
# your configure.ac with the minimum required version, such as:
# XORG_MACROS_VERSION(1.1)
#
# To force at least a version with this macro defined, also add:
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
# To ensure that this macro is defined, also add:
# m4_ifndef([XORG_MACROS_VERSION],
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
#
#
# See the "minimum version" comment for each macro you use to see what
# version you require.
AC_DEFUN([XORG_MACROS_VERSION],[
[XORG_MACROS_needed_version=$1
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
fi
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
fi
AC_MSG_RESULT([yes, $XORG_MACROS_version])
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.6.1])
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,,
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
m4_if(m4_version_compare(vers_have, [$1]), -1,
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
m4_undefine([vers_have])
m4_undefine([maj_have])
m4_undefine([maj_needed])
]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
@ -918,6 +1068,10 @@ else
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS=-undef
AC_MSG_RESULT([yes])
# under Cygwin unix is still defined even with -undef
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS="-undef -ansi"
AC_MSG_RESULT([yes, with -ansi])
else
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
fi
@ -1030,15 +1184,21 @@ 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],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
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_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
BUILDDOC=yes
@ -1050,7 +1210,7 @@ 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
BUILDPDFDOC=yes
@ -1082,7 +1242,9 @@ 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],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
BUILDTXTDOC=no
BUILDPDFDOC=no
@ -1096,7 +1258,7 @@ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
AC_MSG_CHECKING([Whether to build text documentation])
AC_MSG_CHECKING([whether to build text documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
test x$BUILD_TXTDOC != xno; then
BUILDTXTDOC=yes
@ -1104,7 +1266,7 @@ fi
AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
AC_MSG_RESULT([$BUILDTXTDOC])
AC_MSG_CHECKING([Whether to build PDF documentation])
AC_MSG_CHECKING([whether to build PDF documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
@ -1112,7 +1274,7 @@ fi
AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
AC_MSG_RESULT([$BUILDPDFDOC])
AC_MSG_CHECKING([Whether to build PostScript documentation])
AC_MSG_CHECKING([whether to build PostScript documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
test x$BUILD_PSDOC != xno; then
BUILDPSDOC=yes
@ -1120,7 +1282,7 @@ fi
AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
AC_MSG_RESULT([$BUILDPSDOC])
AC_MSG_CHECKING([Whether to build HTML documentation])
AC_MSG_CHECKING([whether to build HTML documentation])
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
test x$BUILD_HTMLDOC != xno; then
BUILDHTMLDOC=yes
@ -1139,6 +1301,490 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK
# XORG_WITH_XMLTO([MIN-VERSION])
# ----------------
# Minimum version: 1.5.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.
#
# 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
#
# 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])
AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto],
[Use xmlto to regenerate documentation (default: yes, if installed)]),
[use_xmlto=$withval], [use_xmlto=auto])
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
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])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
# XORG_WITH_ASCIIDOC([MIN-VERSION])
# ----------------
# Minimum version: 1.5.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.
#
# 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])
AC_ARG_WITH(asciidoc,
AS_HELP_STRING([--with-asciidoc],
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
[use_asciidoc=$withval], [use_asciidoc=auto])
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])
# --------------------------------
# Minimum version: 1.5.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.
#
# 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])
AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen],
[Use doxygen to regenerate documentation (default: yes, if installed)]),
[use_doxygen=$withval], [use_doxygen=auto])
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
# ----------------
# 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 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.
#
# 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
#
# 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])
AC_ARG_WITH(groff,
AS_HELP_STRING([--with-groff],
[Use groff to regenerate documentation (default: yes, if installed)]),
[use_groff=$withval], [use_groff=auto])
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
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])
]) # XORG_WITH_GROFF
# XORG_WITH_FOP
# ----------------
# 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 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.
#
# 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])
AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop],
[Use fop to regenerate documentation (default: yes, if installed)]),
[use_fop=$withval], [use_fop=auto])
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
# ----------------
# 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 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.
#
# 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])
AC_ARG_WITH(ps2pdf,
AS_HELP_STRING([--with-ps2pdf],
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
[use_ps2pdf=$withval], [use_ps2pdf=auto])
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],[
default=$1
if test "x$default" = x ; then
default="yes"
fi
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
[Enable building the documentation (default: yes)]),
[build_docs=$enableval], [build_docs=$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],[
devel_default=$1
if test "x$devel_default" = x ; then
devel_default="yes"
fi
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])
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],[
spec_default=$1
if test "x$spec_default" = x ; then
spec_default="yes"
fi
AC_ARG_ENABLE(specs,
AS_HELP_STRING([--enable-specs],
[Enable building the specs (default: yes)]),
[build_specs=$enableval], [build_specs=$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
@ -1148,7 +1794,7 @@ AC_SUBST(MAKE_HTML)
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
AC_ARG_ENABLE(malloc0returnsnull,
AC_HELP_STRING([--enable-malloc0returnsnull],
AS_HELP_STRING([--enable-malloc0returnsnull],
[malloc(0) returns NULL (default: auto)]),
[MALLOC_ZERO_RETURNS_NULL=$enableval],
[MALLOC_ZERO_RETURNS_NULL=auto])
@ -1168,7 +1814,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])
@ -1200,7 +1847,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
AC_DEFUN([XORG_WITH_LINT],[
# Allow checking code with lint, sparse, etc.
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
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
@ -1241,7 +1888,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
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, [AC_HELP_STRING([--enable-lint-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
@ -1259,6 +1906,94 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
]) # XORG_LINT_LIBRARY
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
#
# Defines CWARNFLAGS to enable C compiler warnings.
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC])
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
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
fi
AC_SUBST(CWARNFLAGS)
]) # XORG_CWARNFLAGS
# XORG_STRICT_OPTION
# -----------------------
# Minimum version: 1.3.0
#
# Add configure option to enable strict compilation
AC_DEFUN([XORG_STRICT_OPTION], [
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CC_C99])
AC_REQUIRE([XORG_CWARNFLAGS])
AC_ARG_ENABLE(strict-compilation,
AS_HELP_STRING([--enable-strict-compilation],
[Enable all warnings from compiler and make them errors (default: disabled)]),
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
if test "x$STRICT_COMPILE" = "xyes"; then
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
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"
AC_SUBST([CWARNFLAGS])
]) # XORG_STRICT_OPTION
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
#
# Defines default options for X.Org modules.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
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
@ -1293,7 +2028,7 @@ dnl
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
AC_HELP_STRING([--with-release-version=STRING],
AS_HELP_STRING([--with-release-version=STRING],
[Use release version string in package name]),
[RELEASE_VERSION="$withval"],
[RELEASE_VERSION=""])
@ -1305,14 +2040,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@ -1321,3 +2056,19 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
[Patch version of this package])
])
# XORG_CHANGELOG()
# ----------------
# Minimum version: 1.2.0
#
# Defines the variable CHANGELOG_CMD as the command to generate
# ChangeLog from git.
#
#
AC_DEFUN([XORG_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])
]) # XORG_CHANGELOG

12
font/util/autogen.sh
View File

@ -1,12 +0,0 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

222
font/util/bdftruncate.c Normal file
View File

@ -0,0 +1,222 @@
/*-
* Copyright (c) 2006 Martin Husemann.
* Copyright (c) 2007 Joerg Sonnenberger.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. The name of the author may not be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* This program is derived (in a straight forward way) from
* bdftruncate.pl -- Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
*
* This utility allows you to generate from an ISO10646-1 encoded
* BDF font other ISO10646-1 BDF fonts in which all characters above
* a threshold code value are stored unencoded.
*/
#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
static int iswide(unsigned int);
static void usage(void);
static int opt_minus_w;
static int opt_plus_w;
static int removewide;
static unsigned long threshold;
static int
parse_threshold(const char *str)
{
int base;
char *end_ptr;
if (!isdigit((unsigned char)*str))
return 1;
if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
base = 16;
else
base = 10;
errno = 0;
threshold = strtoul(str, &end_ptr, base);
if (errno != 0 || threshold == 0)
return 1;
return 0;
}
static void
process_line(const char *line)
{
if (strncmp(line, "ENCODING", 8) == 0) {
unsigned long enc;
const char *v;
v = line + 9;
while (*v && isspace((unsigned char)(*v)))
++v;
enc = strtoul(v, NULL, 10);
/* XXX Check for line-ending? */
if (enc >= threshold || (removewide && iswide(enc))) {
printf("ENCODING -1\n");
} else {
fputs(line, stdout);
}
return;
}
if (strncmp(line, "STARTFONT", 9) == 0) {
fputs(line, stdout);
printf("COMMENT AUTOMATICALLY GENERATED FILE. DO NOT EDIT!\n"
"COMMENT In this version of the font file, "
"all characters >= U+%04lx are\n"
"COMMENT not encoded to keep XFontStruct small.\n",
threshold);
return;
}
if (strncmp(line, "COMMENT", 7) == 0) {
const char *v = line + 8;
while (*v && isspace((unsigned char)(*v)))
v++;
if (strncmp(v, "$id: ", 5) == 0 ||
strncmp(v, "$Id: ", 5) == 0) {
const char *id = strchr(v+1, '$');
if (id) {
printf("COMMENT Derived from %.*s",
(int)(id - v - 4), v + 5);
return;
}
}
}
fputs(line, stdout);
}
int
main(int argc, char **argv)
{
int removewide;
char *line, *input_ptr;
size_t line_len, rest_len;
--argc;
++argv;
if (argc == 0)
usage();
if (strcmp(*argv, "-w") == 0 || strcmp(*argv, "+w") == 0) {
if (**argv == '-')
opt_minus_w = 1;
else
opt_plus_w = 1;
--argc;
++argv;
}
if (argc != 1 || (opt_plus_w && opt_minus_w))
usage();
if (parse_threshold(*argv)) {
fprintf(stderr, "Illegal threshold %s\n", *argv);
usage();
}
if (opt_minus_w)
removewide = 1;
else if (opt_plus_w)
removewide = 0;
else
removewide = (threshold <= 0x3200);
line_len = 1024;
if ((line = malloc(line_len)) == NULL) {
fprintf(stderr, "malloc failed");
exit(EXIT_FAILURE);
}
for (;;) {
if (fgets(line, line_len, stdin) == NULL)
break;
while (strlen(line) == line_len - 1 && !feof(stdin)) {
if (line_len > SSIZE_MAX) {
fprintf(stderr, "input line too large");
exit(EXIT_FAILURE);
}
line = realloc(line, line_len * 2);
if (line == NULL) {
fprintf(stderr, "realloc failed");
exit(EXIT_FAILURE);
}
input_ptr = line + line_len - 1;
rest_len = line_len + 1;
line_len *= 2;
if (fgets(input_ptr, rest_len, stdin) == NULL) {
/* Should not happen, but handle as EOF */
break;
}
}
process_line(line);
}
return EXIT_SUCCESS;
}
/*
* Subroutine to identify whether the ISO 10646/Unicode character code
* ucs belongs into the East Asian Wide (W) or East Asian FullWidth
* (F) category as defined in Unicode Technical Report #11.
*/
static int
iswide(unsigned int ucs)
{
return (ucs >= 0x1100 &&
(ucs <= 0x115f || /* Hangul Jamo */
(ucs >= 0x2e80 && ucs <= 0xa4cf &&
(ucs & ~0x0011) != 0x300a && ucs != 0x303f) || /* CJK .. Yi */
(ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
(ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Comp. Ideographs */
(ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Comp. Forms */
(ucs >= 0xff00 && ucs <= 0xff5f) || /* Fullwidth Forms */
(ucs >= 0xffe0 && ucs <= 0xffe6) ||
(ucs >= 0x20000 && ucs <= 0x2ffff)));
}
static void
usage(void)
{
fprintf(stderr,
"Usage: bdftruncate [+w|-w] threshold <source.bdf >destination.bdf\n"
"\n"
"Example:\n"
"\n"
" bdftruncate 0x3200 <6x13.bdf >6x13t.bdf\n"
"\n"
"will generate the file 6x13t.bdf in which all glyphs with codes\n"
">= 0x3200 will only be stored unencoded (i.e., ENCODING -1).\n"
"Option -w removes East Asian Wide and East Asian FullWidth characters\n"
"(default if threshold <= 0x3200), and option +w keeps them.\n");
exit(EXIT_FAILURE);
}

77
font/util/bdftruncate.pl
View File

@ -1,77 +0,0 @@
#!/usr/bin/perl
#
# bdftruncate.pl -- Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
#
# This Perl script allows you to generate from an ISO10646-1 encoded
# BDF font other ISO10646-1 BDF fonts in which all characters above
# a threshold code value are stored unencoded.
#
# $ucs-fonts: bdftruncate.pl,v 1.7 2004-11-28 18:41:13+00 mgk25 Rel $
# Subroutine to identify whether the ISO 10646/Unicode character code
# ucs belongs into the East Asian Wide (W) or East Asian FullWidth
# (F) category as defined in Unicode Technical Report #11.
sub iswide ($) {
my $ucs = shift(@_);
return ($ucs >= 0x1100 &&
($ucs <= 0x115f || # Hangul Jamo
($ucs >= 0x2e80 && $ucs <= 0xa4cf &&
($ucs & ~0x0011) != 0x300a && $ucs != 0x303f) || # CJK .. Yi
($ucs >= 0xac00 && $ucs <= 0xd7a3) || # Hangul Syllables
($ucs >= 0xf900 && $ucs <= 0xfaff) || # CJK Comp. Ideographs
($ucs >= 0xfe30 && $ucs <= 0xfe6f) || # CJK Comp. Forms
($ucs >= 0xff00 && $ucs <= 0xff5f) || # Fullwidth Forms
($ucs >= 0xffe0 && $ucs <= 0xffe6) ||
($ucs >= 0x20000 && $ucs <= 0x2ffff)));
}
# parse options
if ($ARGV[0] eq '-w' || $ARGV[0] eq '+w') {
$removewide = $ARGV[0] eq '-w';
shift @ARGV;
}
print STDERR <<End if $#ARGV != 0;
Usage: bdftruncate.pl [+w|-w] threshold <source.bdf >destination.bdf
Example:
bdftruncate.pl 0x3200 <6x13.bdf >6x13t.bdf
will generate the file 6x13t.bdf in which all glyphs with codes
>= 0x3200 will only be stored unencoded (i.e., ENCODING -1).
Option -w removes East Asian Wide and East Asian FullWidth characters
(default if threshold <= 0x3200), and option +w keeps them.
End
exit 1 if $#ARGV != 0;
# read threshold value from command line
$threshold = $ARGV[0];
if ($threshold =~ /^(0[xX]|U[+-]?)([0-9a-fA-F]+)$/) {
$threshold = hex($2);
} elsif (!($threshold =~ /^[0-9]+$/)) {
die("Illegal threshold '$threshold'!\n");
}
$removewide = $threshold <= 0x3200 unless defined $removewide;
# filter file
while (<STDIN>) {
if (/^ENCODING\s+(-?\d+)/ &&
($1 >= $threshold || ($removewide && iswide($1)))) {
print "ENCODING -1\n";
} elsif (/^STARTFONT/) {
print;
print "COMMENT AUTOMATICALLY GENERATED FILE. DO NOT EDIT!\n";
printf("COMMENT In this version of the font file, all characters >= " .
"U+%04X are\nCOMMENT not encoded to keep XFontStruct small.\n",
$threshold);
} else {
s/^COMMENT\s+\"(.*)\"$/COMMENT $1/;
s/^COMMENT\s+\$[I]d: (.*)\$\s*$/COMMENT Derived from $1\n/;
print;
}
}

30
font/util/config.h.in
View File

@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
@ -27,5 +54,8 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION

7027
font/util/configure vendored
View File

File diff suppressed because it is too large Load Diff

31
font/util/configure.ac
View File

@ -22,25 +22,34 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(font-util, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util)
AC_INIT(font-util, [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
XORG_DEFAULT_OPTIONS
AC_PROG_CC
AC_PROG_INSTALL
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
AC_MSG_CHECKING([for root directory for font files])
fontrootdir='${datadir}/fonts/X11'
AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR],
[Path to parent of font subdirectories [DATADIR/fonts/X11]])],
[fontrootdir="${withval}"])
AC_SUBST(fontrootdir)
AC_MSG_RESULT([${fontrootdir}])
DEFAULT_MAPDIR=${libdir}/X11/fonts/util
AC_ARG_WITH(mapdir,
AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]),
[MAPDIR="$withval"],
[MAPDIR="$DEFAULT_MAPDIR"])
mapdir='${fontrootdir}/util'
AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR],
[Path to install font maps [FONTROOTDIR/util]])],
[mapdir="${withval}"])
MAPDIR="$mapdir"
AC_SUBST(MAPDIR)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile fontutil.pc])
AC_OUTPUT([Makefile fontutil.m4 fontutil.pc])

227
font/util/fontutil.m4
View File

@ -1,227 +0,0 @@
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation.
dnl
dnl The above copyright notice and this permission notice shall be included
dnl in all copies or substantial portions of the Software.
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 IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
dnl OTHER DEALINGS IN THE SOFTWARE.
dnl
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
# XORG_FONT_CHECK_{maps}()
# ------------------------
# These macros add --enable/disable-{maps} where {maps} are ISO8859-*,
# JISX0201 or KOI8_R. By default, they are all enabled.
AC_DEFUN([XORG_FONT_CHECK_ISO8859_1],[
AC_ARG_ENABLE(iso8859-1,
AS_HELP_STRING([--disable-iso8859-1],
[Build ISO8859-1 fonts (default: yes)]),
[ISO8859_1=$enableval],
[ISO8859_1=yes])
AC_MSG_CHECKING([whether to build ISO8859-1 fonts])
AC_MSG_RESULT([$ISO8859_1])
AM_CONDITIONAL(ISO8859_1, [test "x$ISO8859_1" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_2],[
AC_ARG_ENABLE(iso8859-2,
AS_HELP_STRING([--disable-iso8859-2],
[Build ISO8859-2 fonts (default: yes)]),
[ISO8859_2=$enableval],
[ISO8859_2=yes])
AC_MSG_CHECKING([whether to build ISO8859-2 fonts])
AC_MSG_RESULT([$ISO8859_2])
AM_CONDITIONAL(ISO8859_2, [test "x$ISO8859_2" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_3],[
AC_ARG_ENABLE(iso8859-3,
AS_HELP_STRING([--disable-iso8859-3],
[Build ISO8859-3 fonts (default: yes)]),
[ISO8859_3=$enableval],
[ISO8859_3=yes])
AC_MSG_CHECKING([whether to build ISO8859-3 fonts])
AC_MSG_RESULT([$ISO8859_3])
AM_CONDITIONAL(ISO8859_3, [test "x$ISO8859_3" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_4],[
AC_ARG_ENABLE(iso8859-4,
AS_HELP_STRING([--disable-iso8859-4],
[Build ISO8859-4 fonts (default: yes)]),
[ISO8859_4=$enableval],
[ISO8859_4=yes])
AC_MSG_CHECKING([whether to build ISO8859-4 fonts])
AC_MSG_RESULT([$ISO8859_4])
AM_CONDITIONAL(ISO8859_4, [test "x$ISO8859_4" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_5],[
AC_ARG_ENABLE(iso8859-5,
AS_HELP_STRING([--disable-iso8859-5],
[Build ISO8859-5 fonts (default: yes)]),
[ISO8859_5=$enableval],
[ISO8859_5=yes])
AC_MSG_CHECKING([whether to build ISO8859-5 fonts])
AC_MSG_RESULT([$ISO8859_5])
AM_CONDITIONAL(ISO8859_5, [test "x$ISO8859_5" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_6],[
AC_ARG_ENABLE(iso8859-6,
AS_HELP_STRING([--disable-iso8859-6],
[Build ISO8859-6 fonts (default: yes)]),
[ISO8859_6=$enableval],
[ISO8859_6=yes])
AC_MSG_CHECKING([whether to build ISO8859-6 fonts])
AC_MSG_RESULT([$ISO8859_6])
AM_CONDITIONAL(ISO8859_6, [test "x$ISO8859_6" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_7],[
AC_ARG_ENABLE(iso8859-7,
AS_HELP_STRING([--disable-iso8859-7],
[Build ISO8859-7 fonts (default: yes)]),
[ISO8859_7=$enableval],
[ISO8859_7=yes])
AC_MSG_CHECKING([whether to build ISO8859-7 fonts])
AC_MSG_RESULT([$ISO8859_7])
AM_CONDITIONAL(ISO8859_7, [test "x$ISO8859_7" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_8],[
AC_ARG_ENABLE(iso8859-8,
AS_HELP_STRING([--disable-iso8859-8],
[Build ISO8859-8 fonts (default: yes)]),
[ISO8859_8=$enableval],
[ISO8859_8=yes])
AC_MSG_CHECKING([whether to build ISO8859-8 fonts])
AC_MSG_RESULT([$ISO8859_8])
AM_CONDITIONAL(ISO8859_8, [test "x$ISO8859_8" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_9],[
AC_ARG_ENABLE(iso8859-9,
AS_HELP_STRING([--disable-iso8859-9],
[Build ISO8859-9 fonts (default: yes)]),
[ISO8859_9=$enableval],
[ISO8859_9=yes])
AC_MSG_CHECKING([whether to build ISO8859-9 fonts])
AC_MSG_RESULT([$ISO8859_9])
AM_CONDITIONAL(ISO8859_9, [test "x$ISO8859_9" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_10],[
AC_ARG_ENABLE(iso8859-10,
AS_HELP_STRING([--disable-iso8859-10],
[Build ISO8859-10 fonts (default: yes)]),
[ISO8859_10=$enableval],
[ISO8859_10=yes])
AC_MSG_CHECKING([whether to build ISO8859-10 fonts])
AC_MSG_RESULT([$ISO8859_10])
AM_CONDITIONAL(ISO8859_10, [test "x$ISO8859_10" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_11],[
AC_ARG_ENABLE(iso8859-11,
AS_HELP_STRING([--disable-iso8859-11],
[Build ISO8859-11 fonts (default: yes)]),
[ISO8859_11=$enableval],
[ISO8859_11=yes])
AC_MSG_CHECKING([whether to build ISO8859-11 fonts])
AC_MSG_RESULT([$ISO8859_11])
AM_CONDITIONAL(ISO8859_11, [test "x$ISO8859_11" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_12],[
AC_ARG_ENABLE(iso8859-12,
AS_HELP_STRING([--disable-iso8859-12],
[Build ISO8859-12 fonts (default: yes)]),
[ISO8859_12=$enableval],
[ISO8859_12=yes])
AC_MSG_CHECKING([whether to build ISO8859-12 fonts])
AC_MSG_RESULT([$ISO8859_12])
AM_CONDITIONAL(ISO8859_12, [test "x$ISO8859_12" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_13],[
AC_ARG_ENABLE(iso8859-13,
AS_HELP_STRING([--disable-iso8859-13],
[Build ISO8859-13 fonts (default: yes)]),
[ISO8859_13=$enableval],
[ISO8859_13=yes])
AC_MSG_CHECKING([whether to build ISO8859-13 fonts])
AC_MSG_RESULT([$ISO8859_13])
AM_CONDITIONAL(ISO8859_13, [test "x$ISO8859_13" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_14],[
AC_ARG_ENABLE(iso8859-14,
AS_HELP_STRING([--disable-iso8859-14],
[Build ISO8859-14 fonts (default: yes)]),
[ISO8859_14=$enableval],
[ISO8859_14=yes])
AC_MSG_CHECKING([whether to build ISO8859-14 fonts])
AC_MSG_RESULT([$ISO8859_14])
AM_CONDITIONAL(ISO8859_14, [test "x$ISO8859_14" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_15],[
AC_ARG_ENABLE(iso8859-15,
AS_HELP_STRING([--disable-iso8859-15],
[Build ISO8859-15 fonts (default: yes)]),
[ISO8859_15=$enableval],
[ISO8859_15=yes])
AC_MSG_CHECKING([whether to build ISO8859-15 fonts])
AC_MSG_RESULT([$ISO8859_15])
AM_CONDITIONAL(ISO8859_15, [test "x$ISO8859_15" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_16],[
AC_ARG_ENABLE(iso8859-16,
AS_HELP_STRING([--disable-iso8859-16],
[Build ISO8859-16 fonts (default: yes)]),
[ISO8859_16=$enableval],
[ISO8859_16=yes])
AC_MSG_CHECKING([whether to build ISO8859-16 fonts])
AC_MSG_RESULT([$ISO8859_16])
AM_CONDITIONAL(ISO8859_16, [test "x$ISO8859_16" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_JISX0201],[
AC_ARG_ENABLE(jisx0201,
AS_HELP_STRING([--disable-jisx0201],
[Build JISX0201 fonts (default: yes)]),
[JISX0201=$enableval],
[JISX0201=yes])
AC_MSG_CHECKING([whether to build JISX0201 fonts])
AC_MSG_RESULT([$JISX0201])
AM_CONDITIONAL(JISX0201, [test "x$JISX0201" = xyes])
])
AC_DEFUN([XORG_FONT_CHECK_KOI8_R],[
AC_ARG_ENABLE(koi8-r,
AS_HELP_STRING([--disable-koi8-r],
[Build KOI8-R fonts (default: yes)]),
[KOI8_R=$enableval],
[KOI8_R=yes])
AC_MSG_CHECKING([whether to build KOI8-R fonts])
AC_MSG_RESULT([$KOI8_R])
AM_CONDITIONAL(KOI8_R, [test "x$KOI8_R" = xyes])
])

324
font/util/fontutil.m4.in Normal file
View File

@ -0,0 +1,324 @@
dnl @configure_input@
dnl
dnl This file comes from X.Org's @PACKAGE_STRING@
dnl
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation.
dnl
dnl The above copyright notice and this permission notice shall be included
dnl in all copies or substantial portions of the Software.
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 IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
dnl OTHER DEALINGS IN THE SOFTWARE.
dnl
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)
# ------------------------------------------
# Minimum version: 1.1.0
#
# If you're using a macro added in Version 1.1 or newer, include this in
# your configure.ac with the minimum required version, such as:
# XORG_FONT_MACROS_VERSION(1.1)
#
# To ensure that this macro is defined, also add:
# m4_ifndef([XORG_FONT_MACROS_VERSION],
# [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
#
#
# 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], [@VERSION@])
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,,
[m4_fatal([font-util major version ]maj_needed[ is required but ]vers_have[ found])])
m4_if(m4_version_compare(vers_have, [$1]), -1,
[m4_fatal([font-util version $1 or higher is required but ]vers_have[ found])])
m4_undefine([vers_have])
m4_undefine([maj_have])
m4_undefine([maj_needed])
]) # XORG_FONT_MACROS_VERSION
# XORG_FONT_CHECK_{maps}()
# ------------------------
# Minimum version: 1.0.0
# These macros add --enable/disable-{maps} where {maps} are ISO8859-*,
# JISX0201 or KOI8_R. By default, they are all enabled.
AC_DEFUN([XORG_FONT_CHECK_ISO8859_1], [XORG_FONT_CHECK_ENCODING(ISO8859-1)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_2], [XORG_FONT_CHECK_ENCODING(ISO8859-2)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_3], [XORG_FONT_CHECK_ENCODING(ISO8859-3)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_4], [XORG_FONT_CHECK_ENCODING(ISO8859-4)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_5], [XORG_FONT_CHECK_ENCODING(ISO8859-5)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_6], [XORG_FONT_CHECK_ENCODING(ISO8859-6)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_7], [XORG_FONT_CHECK_ENCODING(ISO8859-7)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_8], [XORG_FONT_CHECK_ENCODING(ISO8859-8)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_9], [XORG_FONT_CHECK_ENCODING(ISO8859-9)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_10],[XORG_FONT_CHECK_ENCODING(ISO8859-10)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_11],[XORG_FONT_CHECK_ENCODING(ISO8859-11)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_12],[XORG_FONT_CHECK_ENCODING(ISO8859-12)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_13],[XORG_FONT_CHECK_ENCODING(ISO8859-13)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_14],[XORG_FONT_CHECK_ENCODING(ISO8859-14)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_15],[XORG_FONT_CHECK_ENCODING(ISO8859-15)])
AC_DEFUN([XORG_FONT_CHECK_ISO8859_16],[XORG_FONT_CHECK_ENCODING(ISO8859-16)])
AC_DEFUN([XORG_FONT_CHECK_JISX0201], [XORG_FONT_CHECK_ENCODING(JISX0201)])
AC_DEFUN([XORG_FONT_CHECK_KOI8_R], [XORG_FONT_CHECK_ENCODING(KOI8-R)])
# XORG_FONT_CHECK_ENCODING(encoding)
# ----------------------------------
# Minimum version: 1.1.0
# This macro adds --enable/disable-<encoding>, enabled by default.
# It replaced individual copies of this code in the above macros in 1.1.
# Currently assumes encoding names will be all upper-case - add m4_toupper
# calls if this is not true in the future.
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])
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])
]) # 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
AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[
m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)])
]) # XORG_FONT_CHECK_ENCODING_LIST
# XORG_FONT_REQUIRED_PROG(VARNAME, progname)
# ------------------------------------------
# Minimum version: 1.1.0
#
# Simple wrapper around AC_PATH_PROG that errors if not found
#
AC_DEFUN([XORG_FONT_REQUIRED_PROG],[
AC_PATH_PROG($1, $2)
if test x"$1" = x; then
AC_MSG_ERROR([$2 is required to build $PACKAGE_NAME.])
fi
])
# XORG_FONT_FCCACHE()
# -------------------
# Minimum version: 1.1.0
#
# Set FCCACHE to path to fc-cache (fontconfig cache builder) if found
# Set RUN_FCCACHE to a rule suitable for substituting into a makefile
# to run fc-cache if found and not installing to $DESTDIR
#
# fc-cache is optional, not required, and should be skipped when making
# packages (installing to $DESTDIR).
#
AC_DEFUN([XORG_FONT_FCCACHE],[
AC_PATH_PROG(FCCACHE, fc-cache)
FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"'
if test x"$FCCACHE" = x ; then
RUN_FCCACHE="${FCCACHE_WARN}"
else
RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else'
RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)"
fi
AC_SUBST([RUN_FCCACHE])
])
# XORG_FONT_COMMON_UTILS()
# ------------------------
# Minimum version: 1.1.0
#
# Call XORG_FONT_REQUIRED_PROG for programs needed for all font types
AC_DEFUN([XORG_FONT_COMMON_UTILS],[
XORG_FONT_FCCACHE
XORG_FONT_REQUIRED_PROG(MKFONTDIR, mkfontdir)
])
# XORG_FONT_SCALED_UTILS()
# ------------------------
# Minimum version: 1.1.0
#
# Call XORG_FONT_REQUIRED_PROG for programs needed for scalable fonts
# (TrueType, OpenType, Type1)
AC_DEFUN([XORG_FONT_SCALED_UTILS],[
XORG_FONT_COMMON_UTILS
XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale)
])
# XORG_FONT_BDF_UTILS()
# ---------------------
# Minimum version: 1.1.0
#
# Call XORG_FONT_REQUIRED_PROG for programs needed for BDF format bitmap fonts
# Also call XORG_FONT_CHECK_COMPRESSION to determine how to compress the
# PCF output files created by bdftopcf
AC_DEFUN([XORG_FONT_BDF_UTILS],[
XORG_FONT_COMMON_UTILS
XORG_FONT_REQUIRED_PROG(BDFTOPCF, bdftopcf)
XORG_FONT_CHECK_COMPRESSION
])
# XORG_FONT_CHECK_COMPRESSION()
# -----------------------------
# Minimum version: 1.1.0
#
# Offer a --with-compression flag to control what compression method is
# used for pcf font files. Offers all the methods currently supported
# by libXfont, including no compression.
AC_DEFUN([XORG_FONT_CHECK_COMPRESSION],[
AC_MSG_CHECKING([font compression method])
AC_ARG_WITH(compression,
[AS_HELP_STRING([--with-compression=<no|compress|gzip|bzip2>],
[compression method to use on pcf fonts])],
[compression="$withval"], [compression="yes"])
if test x"$compression" = "xyes" ; then
compression="gzip"
fi
AC_MSG_RESULT([${compression}])
case ${compression} in
*compress) COMPRESS_SUFFIX=".Z" ;;
*gzip) COMPRESS_SUFFIX=".gz" ;;
*bzip2) COMPRESS_SUFFIX=".bz2" ;;
no|none) COMPRESS_SUFFIX="" ; COMPRESS="cat" ;;
*) AC_MSG_ERROR([${compression} is not a supported compression method]) ;;
esac
if test x"$COMPRESS_SUFFIX" != "x" ; then
XORG_FONT_REQUIRED_PROG(COMPRESS, ${compression})
fi
AC_SUBST([COMPRESS_SUFFIX])
])
# XORG_FONT_UCS2ANY()
# -------------------
# Minimum version: 1.1.0
#
# Call XORG_FONT_REQUIRED_PROG for ucs2any program needed for splitting
# Unicode-encoded BDF format bitmap fonts into subsets for older encodings.
# Also call pkg-config to find the directory with the encoding files needed
# by ucs2any, and export it as MAPFILES_PATH to the Makefiles
AC_DEFUN([XORG_FONT_UCS2ANY],[
XORG_FONT_REQUIRED_PROG(UCS2ANY, ucs2any)
PKG_CHECK_MODULES(MAPS, [fontutil])
AC_MSG_CHECKING([for ucs2any encoding data files])
MAPFILES_PATH=`pkg-config --variable=mapdir fontutil`
AC_SUBST(MAPFILES_PATH)
AC_MSG_RESULT([${MAPFILES_PATH}])
])
# XORG_FONTROOTDIR()
# --------------------
# Minimum version: 1.1.0
#
# Sets FONTROOTDIR to the root directory for font files. Uses the first
# found from:
# --with-fontrootdir
# pkg-config --variable=fontrootdir fontutil
# ${datadir}/fonts/X11
AC_DEFUN([XORG_FONTROOTDIR],[
dnl Ensure $PKG_CONFIG is set first
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_MSG_CHECKING([for root directory for font files])
AC_ARG_WITH(fontrootdir,
AS_HELP_STRING([--with-fontrootdir=DIR],
[Path to root directory for font files]),
[FONTROOTDIR="$withval"])
# if --with-fontrootdir not specified...
if test "x${FONTROOTDIR}" = "x"; then
FONTROOTDIR=`$PKG_CONFIG --variable=fontrootdir fontutil`
fi
# ...and if pkg-config didn't find fontdir in fontutil.pc...
if test "x${FONTROOTDIR}" = "x"; then
FONTROOTDIR="${datadir}/fonts/X11"
fi
AC_SUBST(FONTROOTDIR)
AC_MSG_RESULT([${FONTROOTDIR}])
])
# XORG_FONTSUBDIR(variable, flag, subdir)
# ---------------------------------------
# Minimum version: 1.1.0
#
# Offer a --with-<flag> flag to control directory for font installation
# Default is the specified <subdir> of the font root directory.
# Sets <variable> to the selected directory
AC_DEFUN([XORG_FONTSUBDIR],[
AC_REQUIRE([XORG_FONTROOTDIR])
AC_MSG_CHECKING([for directory for $3 files])
AC_ARG_WITH($2,
[AS_HELP_STRING([--with-$2=DIR],
[Path to $3 files [FONTROOTDIR/$3]])],
[$1="${withval}"], [$1='${FONTROOTDIR}/$3'])
AC_SUBST($1)
AC_MSG_RESULT([${$1}])
]) # XORG_FONTSUBDIR
# XORG_FONTDIR(subdir)
# --------------------
# Minimum version: 1.1.0
#
# Offer a --with-fontdir flag to control directory for font installation
# Default is the specified subdir of the font root directory.
# Sets FONTDIR to the selected directory
AC_DEFUN([XORG_FONTDIR],[XORG_FONTSUBDIR([FONTDIR], [fontdir], [$1])])

3
font/util/fontutil.pc.in
View File

@ -1,6 +1,9 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
datarootdir=@datarootdir@
datadir=@datadir@
fontrootdir=@fontrootdir@
mapdir=@MAPDIR@
Name: FontUtil

8
font/util/ucs2any.c
View File

@ -13,9 +13,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@ -55,7 +52,7 @@
#include <unistd.h>
/* global variable for argv[0] */
const char *my_name = NULL;
static const char *my_name = NULL;
#ifdef NEED_BASENAME
static char *
@ -336,7 +333,7 @@ DEC VT100 graphics characters in the range 1-31 (as expected by
some old xterm versions and a few other applications)
*/
#define decmap_size 31
int decmap[decmap_size] = {
static int decmap[decmap_size] = {
0x25C6, /* BLACK DIAMOND */
0x2592, /* MEDIUM SHADE */
0x2409, /* SYMBOL FOR HORIZONTAL TABULATION */
@ -522,6 +519,7 @@ main(int argc, char *argv[])
char *registry_encoding = NULL;
my_name = argv[0];
bbx.cheight = bbx.cxoff = bbx.cyoff = -1;
startchar = da_new("startchar");
my_char = da_new("my_char");