summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-28 17:43:51 +0000
committerKarl Berry <karl@freefriends.org>2008-04-28 17:43:51 +0000
commit788b6dfdc51830f7148c039b45033b28cc210481 (patch)
tree1bb47bfc3a47a298cd347103a944cf8ebb2ca5d9 /Build/source
parentcfcfd819c353a546190e28baa022976c3aafa338 (diff)
lcdf-typetools 2.67
git-svn-id: svn://tug.org/texlive/trunk@7711 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/README9
-rw-r--r--Build/source/texk/lcdf-typetools/ChangeLog3503
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.am1
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in142
-rw-r--r--Build/source/texk/lcdf-typetools/NEWS6
-rw-r--r--Build/source/texk/lcdf-typetools/README2
-rw-r--r--Build/source/texk/lcdf-typetools/aclocal.m4174
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/cfftot1.12
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc12
-rw-r--r--Build/source/texk/lcdf-typetools/config.h.in6
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure3937
-rw-r--r--Build/source/texk/lcdf-typetools/configure.in2
-rwxr-xr-xBuild/source/texk/lcdf-typetools/depcomp64
-rw-r--r--Build/source/texk/lcdf-typetools/glyphlist.txt31
-rw-r--r--Build/source/texk/lcdf-typetools/include/lcdf/clp.h311
-rwxr-xr-xBuild/source/texk/lcdf-typetools/install-sh348
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools.spec10
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/Makefile.in94
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/afmparse.cc4
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/cff.cc2
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/otfgsub.cc60
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1font.cc22
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1item.cc36
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/t1rw.cc6
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/Makefile.in102
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/clp.c2064
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c2
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/straccum.cc4
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/string.cc4
-rwxr-xr-xBuild/source/texk/lcdf-typetools/missing61
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/main.cc40
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/mmafm.12
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/main.cc36
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/mmpfb.12
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/otfinfo.12
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc8
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/Makefile.in108
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc32
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc6
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/otftotfm.12
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc185
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.12
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc16
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/t1lint.12
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/t1lint.cc4
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/Makefile.in108
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/t1reencode.12
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc32
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/t1testpage.12
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc32
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in100
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.12
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc8
60 files changed, 8553 insertions, 3901 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 23d1e1376d6..16fac43a463 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -1,6 +1,5 @@
$Id$
Copyright 2006, 2007, 2008 TeX Users Group.
-(Originally written in 2006 by Karl Berry.)
You may freely use, modify and/or distribute this file.
This TeX Live directory contains the programs that use the kpathsea
@@ -13,14 +12,14 @@ configuring the whole tree.
Sources for the programs as last checked:
-afm2pl 0.7.03 - ok 5dec06
+afm2pl 0.7.03 - ok 28apr08
http://tex.aanhet.net/afm2pl/
bibtex8 - ?
chktex - ?
-cjkutils - from Werner Lemberg
+cjkutils - Werner Lemberg
detex - ?
@@ -70,7 +69,7 @@ musixflx - ?
ps2pkm - ?
-lcdf-typetools 2.66 - ok 17feb08
+lcdf-typetools 2.67 - ok 28apr08
http://www.lcdf.org/type/
tex4htk
@@ -86,7 +85,7 @@ web2c - maintained here by Karl Berry, ... - core web2c, plain tex, omega.
xdv2pdf - Jonathan Kew
-xdvik 22.84.10 - ok 4dec06
+xdvik 22.84.10 - ok 28apr08
http://xdvi.sourceforge.net/
xdvipdfmx - Jonathan Kew
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
new file mode 100644
index 00000000000..8318a944560
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -0,0 +1,3503 @@
+2008-04-08 Tue 17:56:32 +0000 kohler <kohler>
+Commit fc7c01d31c798c39395090d94803bf48d2f790f4
+
+ * .cvsignore: Improve .cvsignores
+
+2008-03-18 Tue 05:27:48 +0000 kohler <kohler>
+Commit 467b7a58ff3d1c58c9e7ed3e7feef9f30342fc01
+
+ * cfftot1/cfftot1.cc, mmafm/main.cc, mmpfb/main.cc, otf.com,
+ otfinfo/otfinfo.cc, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.cc,
+ t1lint/t1lint.cc, t1reencode/t1reencode.cc,
+ t1testpage/t1testpage.cc, ttftotype42/ttftotype42.cc: update to CLP
+
+2007-09-13 Thu 18:19:12 +0000 kohler <kohler>
+Commit fa563edbe7d6f31ee4631db62dca85ad4dbc0933
+
+ * glyphlist.txt: add new glyph list, which includes license
+
+2007-08-03 Fri 19:47:36 +0000 kohler <kohler>
+Commit 9bf70ccd028c6da1e5608e4106e480ba3174b6d9
+
+ * Makefile.am, lcdf-typetools.spec: update spec file
+
+2007-08-03 Fri 19:35:11 +0000 kohler <kohler>
+Commit 04b378c2d1266e22a906575510f6b3f11013828e
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1, configure.in,
+ libefont/Makefile.am, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/metrics.cc, otftotfm/metrics.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/ttftotype42.1: Account for different fonts'
+ units_per_em (Marc Penninga).
+
+2007-07-22 Sun 21:04:43 +0000 kohler <kohler>
+Commit 32508f3950a5b790cc0b4e15dd390798926dff3f
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to 2.65
+
+2007-07-22 Sun 20:58:48 +0000 kohler <kohler>
+Commit 40ac676a2127879ca243b405344c0e61f5d7c545
+
+ * t1testpage/t1testpage.cc: fix t1testpage if encoding has empty
+ slots (Michael Zedler)
+
+2007-07-17 Tue 16:25:28 +0000 kohler <kohler>
+Commit 62cd0d7339307e89d89a886602a73ea8f12a96ec
+
+ * NEWS: utf8! why wasnt it utf8 before?
+
+2007-06-25 Mon 16:43:42 +0000 kohler <kohler>
+Commit 8927c36981a1388f5ba8893c4c22b7f81d041539
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1: version bump
+
+2007-06-25 Mon 16:43:32 +0000 kohler <kohler>
+Commit ac6575f8575d628d30d7f3cc3b488cbeda7c9042
+
+ * t1lint/: cscheck.cc, cscheck.hh, t1lint.1, t1lint.cc: t1lint:
+ more consistent messages, and check that a moveto separates all
+ flex points
+
+2007-06-25 Mon 16:42:58 +0000 kohler <kohler>
+Commit 3d76f3881c9ce9951d8519e7f81468c8a63150e8
+
+ * ttftotype42/: ttftotype42.1, ttftotype42.cc: XUID should include
+ only numbers from 0 to 2^24-1
+
+2007-06-12 Tue 22:22:48 +0000 kohler <kohler>
+Commit 8871804e3a7702b91b2135ed15fc151c42672ae9
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: nit
+
+2007-04-12 Thu 01:05:43 +0000 kohler <kohler>
+Commit 81fe3fea3dc661d5c1a6b2a6c10b149e15e04f4a
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, mmpfb/t1minimize.cc, otfinfo/otfinfo.1,
+ otftotfm/dvipsencoding.cc, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1dotlessj/t1dotlessj.cc, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/ttftotype42.1: to 2.62: t1dotlessj removes UniqueIDs,
+ and otftotfm unicoding messages are warnings not errors
+
+2007-03-26 Mon 05:19:32 +0000 kohler <kohler>
+Commit cbd8746b754c63b9bd827292fb1f75ecb0964b16
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/ttftotype42.1: to 2.61: re-write pl files with numbers
+ that are out of range (John Owens)
+
+2007-02-28 Wed 00:39:40 +0000 kohler <kohler>
+Commit 97f31023d8492e7deb0f891deed2a833c2eeaf70
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/metrics.cc, otftotfm/metrics.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/secondary.cc, otftotfm/secondary.hh,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to version
+ 2.60: some base encodings fixes, and order fonts so that most
+ frequently used base comes first
+
+2007-02-23 Fri 22:21:30 +0000 kohler <kohler>
+Commit 326b0e69b80479bb59bf7d2058c21f5102e66753
+
+ * mkuniprop.pl, otftotfm/uniprop.cc: update uniprop.cc for Unicode
+ 5.0
+
+2007-02-23 Fri 17:25:14 +0000 kohler <kohler>
+Commit a280bf04ef89346751d6019f226e0cc3401622d8
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/ttftotype42.1: 2.59: POSITION does not encode
+ characters (Achim Blumensath)
+
+2007-02-22 Thu 16:24:50 +0000 kohler <kohler>
+Commit 8cbca7e0d359c4fa160b7ccd5a040d1dca75755d
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to 2.58
+
+2007-02-22 Thu 16:06:03 +0000 kohler <kohler>
+Commit 21bd4228731f061938fc547eb0f1b73305239e38
+
+ * otftotfm/: metrics.cc, otftotfm.cc: otftotfm: another fix, this
+ time with Germandbls -- BASE_LIVE
+
+2007-02-21 Wed 22:00:19 +0000 kohler <kohler>
+Commit 9a14cb28ab260912deeb13a8778d9816fe3d1d14
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to 2.57
+
+2007-02-21 Wed 21:55:42 +0000 kohler <kohler>
+Commit 99675da4c84d994aee4a2ea799730e421ccb3958
+
+ * otftotfm/metrics.cc: mark emptyslots as dead, to avoid fooling
+ other code (Michael Zedler reports)
+
+2007-02-13 Tue 21:31:15 +0000 kohler <kohler>
+Commit 8435f14de51e6fb6bf4ed08fc066d9c408def5ea
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/metrics.cc,
+ otftotfm/metrics.hh, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ otftotfm/secondary.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/ttftotype42.1: to 2.56
+
+2007-02-13 Tue 07:21:09 +0000 kohler <kohler>
+Commit 293af82f13b146ef2e85c40214aa12a4e76ae28c
+
+ * otftotfm/otftotfm.cc: combine adjacent MOVE settings into one
+
+2007-02-12 Mon 15:41:03 +0000 kohler <kohler>
+Commit 202a4ef4246b0998d4be15d3522578107ab8f525
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/metrics.cc,
+ otftotfm/metrics.hh, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: letterspacing
+ inside/to the sides of built glyphs
+
+2007-02-06 Tue 20:44:04 +0000 kohler <kohler>
+Commit a44a99dc3ab23e998bee5597e2928ae4d9b562c2
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to 2.52
+
+2007-02-06 Tue 20:39:51 +0000 kohler <kohler>
+Commit 8c834fe444ef451f76440e2756c536ba33957b99
+
+ * otftotfm/secondary.cc: make sure that we set dj_glyph properly
+
+2007-02-06 Tue 19:21:01 +0000 kohler <kohler>
+Commit a16602e35d7d03f9a6b2b4b15e6943fe27d2dd02
+
+ * otftotfm/: otftotfm.cc, otftotfm.hh, secondary.cc: try to get
+ dotlessj --base-encoding working (not yet)
+
+2007-02-06 Tue 19:20:49 +0000 kohler <kohler>
+Commit 4b72804ce70724ae2d7ac63762f9861cbdabac5f
+
+ * otftotfm/metrics.cc: fix dotlessj crash
+
+2007-02-06 Tue 16:58:00 +0000 kohler <kohler>
+Commit 2927184fae7d67fcc1fb759dabbd30990cf3ba03
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/metrics.cc,
+ otftotfm/metrics.hh, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: fixes to
+ need_base() logic: look for the BASE_LIVE flag, which after all is
+ what its there for
+
+2007-02-06 Tue 10:21:32 +0000 kohler <kohler>
+Commit b1d44e7d6b4b091f237f601e451482d5ca2a0f57
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/metrics.cc,
+ otftotfm/metrics.hh, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: add
+ --base-encodings
+
+2007-01-11 Thu 18:10:30 +0000 kohler <kohler>
+Commit ffae40db3094719ba1e28add5d281b7dc8ea0834
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to 2.49
+
+2006-12-11 Mon 23:50:31 +0000 kohler <kohler>
+Commit b64f1859ef1a20c4d7b0a466924d54af0a9dcdec
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otfinfo/otfinfo.cc,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/ttftotype42.1: to 2.48
+
+2006-10-31 Tue 18:16:58 +0000 kohler <kohler>
+Commit 83b655d04338be11f5f74c9b7edd3f0e23f98cb1
+
+ * otftotfm/otftotfm.1: document overwrite behavior
+
+2006-10-30 Mon 01:05:10 +0000 kohler <kohler>
+Commit 2caa939d70d70dd4f4dc8f3b1f997994ea755365
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/metrics.cc,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, otftotfm/secondary.cc,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1, ttftotype42/ttftotype42.1: to 2.46: NEWS
+
+2006-10-27 Fri 05:32:39 +0000 kohler <kohler>
+Commit 7c223a882f94018ad1b9ed6618225f2724fd2e15
+
+ * t1dotlessj/t1dotlessj.cc: u0237 is another name for dotlessj
+
+2006-09-18 Mon 15:16:04 +0000 kohler <kohler>
+Commit 1fa926658f859f26a7e4ea209f4a308a7b7451f4
+
+ * ttftotype42/ttftotype42.1: nitwq
+
+2006-09-18 Mon 14:11:02 +0000 kohler <kohler>
+Commit 7c056491c985a7355bd72ac54f10737b5748bed7
+
+ * ttftotype42/ttftotype42.1: nit
+
+2006-09-18 Mon 14:10:24 +0000 kohler <kohler>
+Commit 1a7e8fef5b035b301a7f6b86522e369cb4f74a6c
+
+ * ttftotype42/ttftotype42.cc: include "cmap" table for better
+ searchable results
+
+2006-09-18 Mon 00:24:12 +0000 kohler <kohler>
+Commit 250a77fabe51fc614d85bfd959c2d7ea34562fc6
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1, configure.in,
+ mmafm/mmafm.1, mmpfb/mmpfb.1, otfinfo/otfinfo.1,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1,
+ ttftotype42/Makefile.am, ttftotype42/ttftotype42.1,
+ ttftotype42/ttftotype42.cc: add ttftotype42 manual page, versionize
+
+2006-09-18 Mon 00:03:36 +0000 kohler <kohler>
+Commit 42ba23fe44fcbc4c765dabb8bb7338bf29604004
+
+ * Makefile.am, configure.in, libefont/Makefile.am,
+ liblcdf/Makefile.am, otftotfm/Makefile.am, otftotfm/md5.c,
+ otftotfm/md5.h, otftotfm/otftotfm.cc, otftotfm/secondary.cc,
+ otftotfm/secondary.hh, ttftotype42/.cvsignore,
+ ttftotype42/Makefile.am, ttftotype42/ttftotype42.cc: add initial
+ ttftotype42
+
+2006-09-18 Mon 00:03:36 +0000 kohler <kohler>
+Commit 3a3d60228a29485fb609b67c834c3a7d85e64995
+
+ * ttftotype42/ttftotype42.cc: add initial ttftotype42
+
+2006-09-17 Sun 00:26:37 +0000 kohler <kohler>
+Commit f6a6773aa8f3f927d43bd060c678b6e4345ccfbf
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otfinfo/otfinfo.cc,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1reencode/t1reencode.1, t1testpage/t1testpage.1:
+ to 2.44: new size params
+
+2006-08-22 Tue 17:14:03 +0000 kohler <kohler>
+Commit 0f7a3a135466010450226417aa030cfebd562ffa
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/kpseinterface.c,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: version 2.43:
+ check for availability of kpse_opentype_format
+
+2006-08-22 Tue 15:48:01 +0000 kohler <kohler>
+Commit f2ea9b18fe8e86892cd7f982ea1655fde5329a37
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1: to version 2.42
+
+2006-08-22 Tue 15:43:08 +0000 kohler <kohler>
+Commit eda985a3f4e2b0596b2f0bf0850a98c0074d3747
+
+ * otfinfo/otfinfo.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/otftotfm.cc: actually encode the altselector, in addition
+ to using it as an altselector
+
+2006-08-13 Sun 03:23:38 +0000 kohler <kohler>
+Commit 5379e5a0a68255beed9877b983e150306b70e467
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: version 2.41
+
+2006-08-04 Fri 04:42:49 +0000 kohler <kohler>
+Commit b80520cf4627d24e8f180d4f80458b6869c5ad93
+
+ * otftotfm/: automatic.cc, automatic.hh, kpseinterface.c,
+ kpseinterface.h, otftotfm.1, otftotfm.cc, otftotfm.hh,
+ secondary.cc, util.hh: install TrueType font if required
+
+2006-08-02 Wed 01:28:35 +0000 kohler <kohler>
+Commit d5ff443050e5401672bcfe87f8f5fdda7db67dc2
+
+ * lcdf-typetools.spec: patchlet
+
+2006-08-02 Wed 00:38:35 +0000 kohler <kohler>
+Commit 32e553c44cf71f0ffd2341d6ab1eef985ea0dcb2
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1, configure.in,
+ mmafm/mmafm.1, mmpfb/mmpfb.1, otf.com, otfinfo/otfinfo.1,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/metrics.cc, otftotfm/metrics.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/secondary.cc, otftotfm/secondary.hh,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1: to version 2.40: complete TT flavor
+ support for otftotfm
+
+2006-08-01 Tue 15:52:48 +0000 kohler <kohler>
+Commit 30e7cdab5c7283f5c2390dcac7b53866b5337860
+
+ * libefont/Makefile.am, otfinfo/otfinfo.cc, otftotfm/otftotfm.cc,
+ otftotfm/otftotfm.hh, otftotfm/secondary.cc, otftotfm/secondary.hh:
+ toward straight TT support for otftotfm
+
+2006-07-12 Wed 01:54:16 +0000 kohler <kohler>
+Commit 91ece79a39fa7d43f7f0d37f871a112f40f7e142
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1: to 2.39: Zedler fix
+
+2006-07-12 Wed 01:47:31 +0000 kohler <kohler>
+Commit 06b43297bbabfb5b44afee934d02d658a76b291e
+
+ * cfftot1/maket1font.cc: capture all subroutine correspondences
+
+2006-06-22 Thu 22:36:11 +0000 kohler <kohler>
+Commit 320d69a881f21da7c82d1907e756df8a8eb0389f
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otfinfo/otfinfo.cc,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: to 2.38: add
+ otfinfo options
+
+2006-05-11 Thu 00:04:12 +0000 kohler <kohler>
+Commit ccdad9c3a48da6803afe599e94a2d726dffa97d7
+
+ * otftotfm/otftotfm.1: -fsmcp
+
+2006-04-06 Thu 16:42:41 +0000 kohler <kohler>
+Commit a3a6fca2a5704ee6ffaf07eea3fcc28d3d405fc3
+
+ * otftotfm/otftotfm.1: add paragraph on phi
+
+2006-01-26 Thu 08:00:47 +0000 kohler <kohler>
+Commit a27a22cc3b76a4fd2b4812209f9e1bbb3ef55f4c
+
+ * NEWS, cfftot1/cfftot1.cc, cfftot1/maket1font.cc, mmafm/main.cc,
+ mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/t1minimize.cc,
+ mmpfb/t1rewrit.cc, otfinfo/otfinfo.cc, otftotfm/automatic.cc,
+ otftotfm/dvipsencoding.cc, otftotfm/glyphfilter.cc,
+ otftotfm/kpseinterface.c, otftotfm/metrics.cc, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/secondary.cc, otftotfm/uniprop.cc,
+ otftotfm/util.cc, t1dotlessj/t1dotlessj.cc, t1lint/cscheck.cc,
+ t1lint/t1lint.cc, t1reencode/t1reencode.cc, t1reencode/util.cc,
+ t1testpage/t1testpage.cc: update copyright years, fix bug in
+ metrics.cc, more lenient about unicode ranges
+
+2006-01-19 Thu 08:03:33 +0000 kohler <kohler>
+Commit 1648ed3e8d4c02898ac08dc45f780afe72545bb9
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/secondary.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1, texglyphlist.txt:
+ to 2.37
+
+2006-01-04 Wed 01:10:13 +0000 kohler <kohler>
+Commit fd7ee7bed1165e100f331ff45d4d84b7822f4df2
+
+ * otftotfm/otftotfm.1: man page fixes from C.M. Connelly
+
+2005-11-09 Wed 17:23:02 +0000 kohler <kohler>
+Commit f8326badd052a0afa4155953b3261ffd2e8a7ba9
+
+ * README: mininit
+
+2005-11-09 Wed 17:16:10 +0000 kohler <kohler>
+Commit ab6b7d23c5dc2e95af68c7c51b037e3c03cda6d4
+
+ * NEWS, cfftot1/cfftot1.cc, configure.in, mmpfb/main.cc,
+ otfinfo/otfinfo.cc, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.cc,
+ t1lint/t1lint.cc: new SilentErrorHandler business (Achim
+ Blumensath)
+
+2005-10-21 Fri 08:20:30 +0000 kohler <kohler>
+Commit 7a11ef0772743707bcdd60477b5af02c5234c529
+
+ * NEWS, otfinfo/otfinfo.1, otfinfo/otfinfo.cc: add -a/--family
+ (Ottavio G. Rizzo)
+
+2005-10-04 Tue 00:38:02 +0000 kohler <kohler>
+Commit c11f00be087f3df3a30ebfdcee5874e8dfd99fe9
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1: versionize, and release (thought i
+ released 2.35 much earlier, but in fact did not)
+
+2005-09-26 Mon 17:07:19 +0000 kohler <kohler>
+Commit 572b8be778e82d5ab88c81f1fe87172523ed28b8
+
+ * otftotfm/otftotfm.1: nit
+
+2005-09-13 Tue 15:06:45 +0000 kohler <kohler>
+Commit f5c35660f9f82c8bb3939df873e1890c7755f48c
+
+ * NEWS, otfinfo/otfinfo.1, otfinfo/otfinfo.cc: document -t/--tables
+
+2005-09-13 Tue 04:32:17 +0000 kohler <kohler>
+Commit b5f9526e65937bb92df5c8580af4b1639a4d8fea
+
+ * NEWS, configure.in, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh: allow "T h=:T_h"
+
+2005-09-09 Fri 17:02:14 +0000 kohler <kohler>
+Commit d7360916c43310e7081a0aadda279eae3ec7d7b9
+
+ * NEWS, otfinfo/otfinfo.1, otfinfo/otfinfo.cc: add --font-version
+ option
+
+2005-09-09 Fri 15:28:14 +0000 kohler <kohler>
+Commit 5ea17fb6f76b032c5c56faa090aff7b0bbec063d
+
+ * NEWS, t1reencode/checkencs.pl, t1reencode/t1reencode.1,
+ t1reencode/t1reencode.cc: t1reencode: add more standard encodings
+ from Peter Betzler
+
+2005-09-09 Fri 13:52:42 +0000 kohler <kohler>
+Commit 8ab6dfaddf45eec4bea56be6818a40838c765cc8
+
+ * otftotfm/otftotfm.1: explicitly mark -fcswh as an alternative to
+ -fswsh
+
+2005-07-07 Thu 15:14:31 +0000 kohler <kohler>
+Commit 960c4145ec218e50c3142d8c3ce7608073896f65
+
+ * otftotfm/dvipsencoding.cc, texglyphlist.txt: use comma as a
+ separator for the preference order (suggested by some dvipdfmx guy)
+
+2005-07-02 Sat 18:17:16 +0000 kohler <kohler>
+Commit f4fee52c0f0e483bbc5941d937a8400242731724
+
+ * configure.in, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/metrics.cc,
+ otftotfm/metrics.hh, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ texglyphlist.txt: close to 2.35: add support for --warn-missing,
+ texglyphlist.txt, fix manual page
+
+2005-07-02 Sat 18:16:45 +0000 kohler <kohler>
+Commit 0733843283a26c6d8ab1109c865c7bd50b9f442b
+
+ * NEWS: close to 2.35
+
+2005-07-01 Fri 20:07:24 +0000 kohler <kohler>
+Commit 3cf605b6471176227cbe72bc5a547613c69cef97
+
+ * Makefile.am, glyphlist.txt, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/kpseinterface.c,
+ otftotfm/kpseinterface.h, otftotfm/otftotfm.cc, texglyphlist.txt:
+ glyphlist.txt -> glyphlist.txt texglyphlist.txt
+
+2005-06-11 Sat 19:09:03 +0000 kohler <kohler>
+Commit e26066672509c97b4a5feef5a179318f7c219fdc
+
+ * NEWS, otftotfm/otftotfm.cc: to 2.34
+
+2005-06-11 Sat 16:57:31 +0000 kohler <kohler>
+Commit e21f93dae7a6721d6803b33c5ace33d7d579d84d
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/kpseinterface.c,
+ otftotfm/kpseinterface.h, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: look up
+ glyphlist.txt in a TDS
+
+2005-06-05 Sun 21:41:07 +0000 kohler <kohler>
+Commit 74672d65bbf24f98fcf3ca1b71ea9d808039df1b
+
+ * otftotfm/: otftotfm.1, otftotfm.cc: manual improvements
+
+2005-06-05 Sun 16:15:25 +0000 kohler <kohler>
+Commit 70e1236c99085453f4fc66260cc4276cb15c2013
+
+ * README: license link update
+
+2005-06-04 Sat 21:28:16 +0000 kohler <kohler>
+Commit d8800d7fe6664dc32c419a84b38b3ef9534471d7
+
+ * otftotfm/otftotfm.1: nit
+
+2005-06-04 Sat 21:24:04 +0000 kohler <kohler>
+Commit b09e39bd7ca7f90e348ff1c83672fc5c55d15dde
+
+ * otftotfm/otftotfm.1: nit
+
+2005-06-04 Sat 06:05:42 +0000 kohler <kohler>
+Commit fe518cc945fbdb7f0195707ecd656b4e26993e6c
+
+ * cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1reencode/t1reencode.1, t1testpage/t1testpage.1:
+ update documentation
+
+2005-06-04 Sat 00:33:17 +0000 kohler <kohler>
+Commit 72261a38c7115f23071b96f6c488f248d4d5495e
+
+ * NEWS, configure.in, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: to 2.33: add --position
+
+2005-06-03 Fri 07:13:41 +0000 kohler <kohler>
+Commit e5cc583b967500432cb145e8af3b6449776df0ce
+
+ * NEWS, README, glyphlist.txt, otftotfm/secondary.cc: new
+ secondaries from Zedler
+
+2005-05-31 Tue 15:14:40 +0000 kohler <kohler>
+Commit 2c813a21c743e98bd64fcb8ae317b60d801066c8
+
+ * NEWS, configure.in, otftotfm/metrics.cc, otftotfm/metrics.hh,
+ otftotfm/otftotfm.cc: correct handling of base_glyphs (Michael
+ Zedler)
+
+2005-05-31 Tue 00:36:17 +0000 kohler <kohler>
+Commit 567a6182eb5cd9a3b4045ae47085e2a949dfb598
+
+ * NEWS, configure.in, otftotfm/metrics.cc, otftotfm/metrics.hh,
+ otftotfm/otftotfm.cc: add PUSH and POP, and base character nits
+
+2005-05-30 Mon 23:45:41 +0000 kohler <kohler>
+Commit f9b286bfc63f2119b718ebf655733f9cd630f5cb
+
+ * otftotfm/: metrics.cc, otftotfm.cc: try to fix michael zedler
+ problem
+
+2005-05-18 Wed 00:55:52 +0000 kohler <kohler>
+Commit 501597f81639fd10cee2aadd344fa984931acbdc
+
+ * cfftot1/maket1font.cc, mmpfb/t1rewrit.cc, t1lint/cscheck.cc:
+ avoid "CS" #define (Nelson Beebe)
+
+2005-05-12 Thu 16:17:22 +0000 kohler <kohler>
+Commit 58a7176f1b84a8fc2e996523fcfe337fa4614de4
+
+ * otftotfm/otftotfm.1: mangafoo
+
+2005-05-09 Mon 05:27:15 +0000 kohler <kohler>
+Commit 9ae7e912922aa84878641c8c86453a2b98ecc386
+
+ * NEWS, configure.in, glyphlist.txt, otf.com, otftotfm/otftotfm.cc,
+ otftotfm/secondary.cc: add support for secondaries
+ dblbracket{left,right}; required some other rejiggerings
+
+2005-05-09 Mon 04:53:55 +0000 kohler <kohler>
+Commit 33073ee1d9ad23e914db94c3b9b42d944c3c67f1
+
+ * otftotfm/: dvipsencoding.cc, secondary.cc: try to encode glyph in
+ Secondary if it cannot be found
+
+2005-05-09 Mon 01:05:47 +0000 kohler <kohler>
+Commit e51db86667dbaf607450dafaac329fb34b233566
+
+ * otftotfm/: dvipsencoding.cc, dvipsencoding.hh: {L} and {5}
+ ligkern statements combine, rather than overriding each other
+ (Michael Zedler)
+
+2005-05-07 Sat 19:58:48 +0000 kohler <kohler>
+Commit e031060ee708e56578f32a0dc94fad99dc155fd4
+
+ * Makefile.am, NEWS, configure.in, glyphlist.txt,
+ libefont/Makefile.am, otftotfm/automatic.cc, otftotfm/metrics.cc,
+ otftotfm/otftotfm.cc, otftotfm/otftotfm.hh, otftotfm/secondary.cc,
+ otftotfm/secondary.hh: to 2.29: add FontInfo, OS/2 table support,
+ bug fix in Metrics
+
+2005-04-28 Thu 00:50:23 +0000 kohler <kohler>
+Commit 35675689424e03ec9abac4e811c530a7a958d87f
+
+ * NEWS, configure.in, otftotfm/otftotfm.cc: to 2.28
+
+2005-04-25 Mon 01:17:55 +0000 kohler <kohler>
+Commit bad785bcfecb1477e787d533bbafaf762c81c41c
+
+ * NEWS, otftotfm/dvipsencoding.cc, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: to 2.27: add skewchar support (Achim
+ Blumensath)
+
+2005-04-15 Fri 22:45:08 +0000 kohler <kohler>
+Commit cc81b68934e06325dd48ac28ddcf168882995b05
+
+ * NEWS, configure.in, otftotfm/otftotfm.1: X {5} Y (Achim
+ Blumenthal)
+
+2005-04-14 Thu 07:21:54 +0000 kohler <kohler>
+Commit d1ec63e7c11154fe24f048c8d111f3bb1caf2dff
+
+ * otf.com, otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/metrics.cc, otftotfm/metrics.hh: Achim Blumensath: X
+ {kernamt} Y
+
+2005-04-03 Sun 02:30:51 +0000 kohler <kohler>
+Commit 9e8d2a4a521db00d8a5e85b314f390632edf7b9f
+
+ * NEWS, README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otfinfo/otfinfo.cc, otftotfm/metrics.cc,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1reencode/t1reencode.1, t1testpage/t1testpage.1:
+ fix f | f i => f i bug; to 2.26
+
+2005-03-28 Mon 06:56:43 +0000 kohler <kohler>
+Commit 6bdc25f06aa2ee52b513d05358edc2babaca6777
+
+ * NEWS, configure.in, otfinfo/otfinfo.1, otfinfo/otfinfo.cc:
+ otfinfo: add --tables, rename options to get rid of --query; bump
+ version (but dont yet release)
+
+2005-03-11 Fri 02:47:12 +0000 kohler <kohler>
+Commit 7deb04d31a1be74e636617c2a3049224acb3fb21
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: to 2.25
+
+2005-03-11 Fri 02:16:11 +0000 kohler <kohler>
+Commit 4483c726bf4df1368b6a0b697d2042624ce2b7e7
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: to 2.24
+
+2005-03-08 Tue 23:13:20 +0000 kohler <kohler>
+Commit 212a57d3ef154d51e1342384b4582f2e58d164a7
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: improve
+ DvipsEncoding character assingment logic (Michael Zedler)
+
+2005-03-04 Fri 19:22:43 +0000 kohler <kohler>
+Commit 63468d05cacf9b9cf1e699ec6cfa889315da413e
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: to version 2.22
+
+2005-02-18 Fri 01:04:59 +0000 kohler <kohler>
+Commit 084ca05eaa452abd5f9061f66d4a1bbe31c34fc1
+
+ * NEWS, README, cfftot1/cfftot1.1, cfftot1/maket1font.cc,
+ configure.in, mmafm/mmafm.1, mmpfb/mmpfb.1, otfinfo/otfinfo.1,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1reencode/t1reencode.1, t1testpage/t1testpage.1:
+ move to 2.21
+
+2005-02-16 Wed 06:50:03 +0000 kohler <kohler>
+Commit c8c8e095f55a4c1d41c3052f04c65633379137e1
+
+ * NEWS, otftotfm/otftotfm.cc: base fonts include no kerns or
+ ligatures (Michael Zedler)
+
+2005-02-09 Wed 23:53:32 +0000 kohler <kohler>
+Commit 6e0ecc0d5aeaef439fd4ebcfbe0a8bf8819dbb63
+
+ * NEWS, README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1reencode/t1reencode.1, t1testpage/t1testpage.1:
+ versionize
+
+2005-02-09 Wed 23:51:37 +0000 kohler <kohler>
+Commit 81be034b84dea0dcb4c96bd1078336306f7d41be
+
+ * otf.com, otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc: better support for
+ explicit ligatures: they override existing ligatures, and they
+ strongly encourage the character to appear in the encoidng. Also
+ document Achim Blumensath's options. Michael Zedler request
+ inspired explicit ligature stuff.
+
+2005-02-07 Mon 19:35:22 +0000 kohler <kohler>
+Commit 318edb53056285913d56b99694596b278eb38421
+
+ * NEWS, configure.in, otftotfm/otftotfm.cc: add Achim Blumensaths
+ --math-spacing and --space-factor options
+
+2005-02-05 Sat 19:22:42 +0000 kohler <kohler>
+Commit c247d2907b59e4e4aca94e9c09618d63145a4700
+
+ * otftotfm/: automatic.cc, otftotfm.1, otftotfm.cc, util.cc,
+ util.hh: Christian Uebber reported surprising behavior; document
+ --force and add --verbose info to reduce the surprise
+
+2005-02-05 Sat 04:55:47 +0000 kohler <kohler>
+Commit 15bd0cc1328d861fd655dc6bb8e57a1aee902140
+
+ * otftotfm/automatic.cc: call updmap twice, since updmap --enable
+ can exit early and we dont want it to
+
+2005-02-04 Fri 09:32:50 +0000 kohler <kohler>
+Commit bcb737c69be6bfb1058c74b96a1026b7278ec903
+
+ * NEWS: NEWS update
+
+2005-02-04 Fri 09:32:43 +0000 kohler <kohler>
+Commit 18cc02e8dda61f3dcf94cf071f738c6c88375c7e
+
+ * otftotfm/glyphfilter.cc: minor bug
+
+2005-02-04 Fri 09:32:24 +0000 kohler <kohler>
+Commit cdc007cb4df94d47494102ff214052dbb7229e81
+
+ * otftotfm/: otftotfm.1, otftotfm.cc: remove debug output, accept
+ --subs-filter/--alternates-filter
+
+2005-02-04 Fri 09:06:46 +0000 kohler <kohler>
+Commit 97a99e36dd1ae64a73d3cdeb01d1ee2bed3484a3
+
+ * NEWS, otftotfm/util.cc: nits: on dos/win, dont quote
+
+2005-02-04 Fri 04:28:06 +0000 kohler <kohler>
+Commit a4fcfa5011ed4e764d6d036c959b26f9b53eca7c
+
+ * NEWS, README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1reencode/t1reencode.1,
+ t1testpage/t1testpage.1: versionize
+
+2005-02-04 Fri 04:28:02 +0000 kohler <kohler>
+Commit a373a7607d42773de614d312b5162d518cf3975d
+
+ * otftotfm/: automatic.cc, otftotfm.1, otftotfm.cc: nits
+
+2005-02-04 Fri 04:27:47 +0000 kohler <kohler>
+Commit 968c619159e165023030a1cc25d42904a5a64616
+
+ * otftotfm/glyphfilter.cc: fix glyph filter unicode ranges
+
+2005-02-04 Fri 04:27:26 +0000 kohler <kohler>
+Commit 5f031c9d124e17d699f83c289cded277d65628cf
+
+ * otfinfo/: otfinfo.1, otfinfo.cc: add --query-glyphs/-g option
+
+2005-02-04 Fri 03:06:31 +0000 kohler <kohler>
+Commit 4ce1e1e5921faf41ecb5e48a11443b1912e7af77
+
+ * NEWS, configure.in, otftotfm/automatic.cc, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/otftotfm.hh, otftotfm/util.hh:
+ automatic mode does updmap out of the box
+
+2005-02-03 Thu 19:14:15 +0000 kohler <kohler>
+Commit 26f28f0b3490732512d8619b7283627fb984a657
+
+ * otftotfm/: automatic.cc, otftotfm.cc, util.cc, util.hh: protect
+ filenames passed to system(), spurred by Achim Blumensath
+
+2005-02-03 Thu 18:41:37 +0000 kohler <kohler>
+Commit 5b12d01dd73d66b34f6600830f8a6d32555a98e3
+
+ * otftotfm/: automatic.cc, otftotfm.1: updates for $TEXMFVAR
+
+2005-01-26 Wed 17:34:23 +0000 kohler <kohler>
+Commit 554277b1d02a4681678b32f63840c823188d0d5f
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1reencode/t1reencode.1, t1testpage/t1testpage.1: fix bug that was
+ causing infinite loops: an obvious || vs. && error, hidden by an
+ #ifdef
+
+2005-01-26 Wed 17:00:02 +0000 kohler <kohler>
+Commit ba2ab95fed4d83b8efb77f6308f718e5c460ea68
+
+ * configure.in, otf.com: otf.com
+
+2005-01-05 Wed 03:55:23 +0000 kohler <kohler>
+Commit e1e1172a93a9a15dce3d623772958b259816646f
+
+ * README: add t1reencode to README
+
+2005-01-05 Wed 03:47:38 +0000 kohler <kohler>
+Commit c96f546773bb0e1192ead6e56cfc8d2a01bc696a
+
+ * NEWS, README, cfftot1/cfftot1.1, cfftot1/cfftot1.cc,
+ configure.in, mmafm/main.cc, mmafm/mmafm.1, mmpfb/main.cc,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otfinfo/otfinfo.cc,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1,
+ t1dotlessj/t1dotlessj.cc, t1lint/t1lint.1, t1lint/t1lint.cc,
+ t1reencode/t1reencode.1, t1reencode/t1reencode.cc,
+ t1testpage/t1testpage.1, t1testpage/t1testpage.cc: to 2.17
+
+2005-01-05 Wed 02:40:33 +0000 kohler <kohler>
+Commit 41d97bf63b5204a679d28e52286a55ef9afd9472
+
+ * otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1reencode/Makefile.am, t1reencode/md5.c, t1reencode/md5.h,
+ t1reencode/t1reencode.cc: t1reencode updates: almost working, sort
+ of
+
+2005-01-04 Tue 19:48:07 +0000 kohler <kohler>
+Commit 76c3fefca58af2793f56883b189381a4ccd2af26
+
+ * .cvsignore, Makefile.am, configure.in, t1reencode/.cvsignore,
+ t1reencode/Makefile.am, t1reencode/t1reencode.1,
+ t1reencode/t1reencode.cc, t1reencode/util.cc, t1reencode/util.hh:
+ add t1reencode (but not sure yet it should be distributed)
+
+2004-11-21 Sun 19:02:42 +0000 kohler <kohler>
+Commit 014b7bece1f532d3e97a8117b9331913130b4a43
+
+ * t1testpage/t1testpage.cc: include *.whatever immediately after *
+
+2004-11-20 Sat 06:16:17 +0000 kohler <kohler>
+Commit 5592334b8e2055db9aeab455eab70e90fd8de79d
+
+ * t1dotlessj/t1dotlessj.1: s/J/j/
+
+2004-11-20 Sat 04:46:53 +0000 kohler <kohler>
+Commit 20d360e2e88badc3f6bdec4f81e7d548864f9da7
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ lcdf-typetools.spec, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/glyphfilter.cc,
+ otftotfm/glyphfilter.hh, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ to version 2.16: include- and exclude-alternates updates
+
+2004-10-26 Tue 04:51:54 +0000 kohler <kohler>
+Commit 99c6cd615cbc0f2056c84ead2c67be75c4a21601
+
+ * configure.in, otftotfm/Makefile.am: tetex-build dependency
+
+2004-10-10 Sun 19:03:36 +0000 kohler <kohler>
+Commit cb47ade6e48a66322e2b7a0c5377c65591a164a8
+
+ * configure.in: more --enable-tetex-build
+
+2004-10-09 Sat 06:53:21 +0000 kohler <kohler>
+Commit b70fa6f9eff22126375d8389a1f57f54fee832ff
+
+ * configure.in: --enable-tetex-build
+
+2004-10-05 Tue 23:16:43 +0000 kohler <kohler>
+Commit c483b5ca3267f93b8b08c300416c1ec458bd2638
+
+ * configure.in: add support for --with-kpathsea=texk-local
+
+2004-10-01 Fri 07:42:29 +0000 kohler <kohler>
+Commit 95a0c92b2f5494e89f5fcec99621d91d3a1a6a9d
+
+ * otftotfm/: metrics.cc, otftotfm.cc: revert some Popineauisms
+
+2004-10-01 Fri 01:42:29 +0000 kohler <kohler>
+Commit 147e93d108091ce71ef8831abfb3de4de297ac75
+
+ * Makefile.am, NEWS, mmpfb/t1rewrit.cc, otftotfm/glyphfilter.cc,
+ otftotfm/glyphfilter.hh, otftotfm/metrics.cc, otftotfm/otftotfm.cc,
+ otftotfm/util.hh, t1testpage/t1testpage.cc: Microsoft CC updates
+ from Fabrice Popineau
+
+2004-09-22 Wed 00:10:02 +0000 kohler <kohler>
+Commit 9304e85a8d2b2ecb36fc55fbaf484bec4c5bc758
+
+ * otftotfm/otftotfm.1: backtrackabit
+
+2004-09-22 Wed 00:00:23 +0000 kohler <kohler>
+Commit 82a709c771aba91b96e1d6e596b5392b477efea2
+
+ * README, lcdf-typetools.spec, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otftotfm/otftotfm.1: manpage updates from Claire Connelly, and a
+ spec from her too
+
+2004-09-18 Sat 07:22:03 +0000 kohler <kohler>
+Commit accf967cba1300a59e414807a234942b658f8063
+
+ * NEWS, mmpfb/myfont.hh: volovich
+
+2004-09-18 Sat 00:26:17 +0000 kohler <kohler>
+Commit 07bc24bc64d9b040f7d8c8955e619ba6fbbc257d
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ towards 2.15
+
+2004-09-18 Sat 00:18:53 +0000 kohler <kohler>
+Commit 07cd9e3d8f9fd6e051f750ddbc868e331ac645bd
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/glyphfilter.hh,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to version 2.14
+
+2004-09-12 Sun 17:08:10 +0000 kohler <kohler>
+Commit fe5e71fcd33ce3daaaae246a1096b5542a45d0f1
+
+ * NEWS, README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/automatic.cc, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ versionize, and search both $VARTEXMF and $TEXMF (Simon Patarin)
+
+2004-08-22 Sun 06:24:20 +0000 kohler <kohler>
+Commit 56cbe7192b1de82e81fcb5ce74faaabbf9dc7d1d
+
+ * configure.in: selfauto fix
+
+2004-08-22 Sun 06:21:33 +0000 kohler <kohler>
+Commit e5aa0799980ea3fb1c52ecc2a2d8adb15cc01d7d
+
+ * NEWS, configure.in, otftotfm/kpseinterface.c: SELFAUTO support
+
+2004-08-20 Fri 00:38:48 +0000 kohler <kohler>
+Commit 5674c2051bc01771af91e38a846c1901a1ecd172
+
+ * README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1testpage/t1testpage.1: to 2.12
+
+2004-08-20 Fri 00:35:41 +0000 kohler <kohler>
+Commit 6bc62c4d038b966c081f0f4177cacd163ced82a0
+
+ * NEWS, configure.in, otftotfm/automatic.cc: catch bug that would
+ cause problems on 64-bit machines
+
+2004-08-19 Thu 01:25:16 +0000 kohler <kohler>
+Commit cbfba398655e006ae70c499d8dcc978e8033baf4
+
+ * otftotfm/automatic.cc: another nit
+
+2004-08-19 Thu 01:24:13 +0000 kohler <kohler>
+Commit ef1ec233372ec3eac9265a719b6d26f57ffa5b21
+
+ * otftotfm/automatic.cc: more kpsehell
+
+2004-08-19 Thu 01:03:37 +0000 kohler <kohler>
+Commit c443860e3f9871d2c34bb99ec6b4d4519b513e3b
+
+ * otftotfm/automatic.cc: fix bug wrt tds_1_1 detection
+
+2004-08-19 Thu 00:54:57 +0000 kohler <kohler>
+Commit 0db4ad56934017a5bc176842213bb21b06416756
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/automatic.cc,
+ otftotfm/kpseinterface.c, otftotfm/kpseinterface.h,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: Olaf Weber plan for TDS 1.1 vs. 1.0
+
+2004-08-19 Thu 00:42:38 +0000 kohler <kohler>
+Commit 50cc9081d77cfe1dcb4a303ec29e55d259253d35
+
+ * NEWS, README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1testpage/t1testpage.1: release 2.10
+
+2004-08-18 Wed 06:16:36 +0000 kohler <kohler>
+Commit 0c1f3d32515985d51bf1203156a673d5afcdeaf5
+
+ * otftotfm/automatic.cc: fix bug
+
+2004-08-18 Wed 02:01:26 +0000 kohler <kohler>
+Commit dcedf53f95dc33b4c0d144130182f1828e207dcf
+
+ * NEWS, configure.in, otftotfm/automatic.cc, otftotfm/otftotfm.1:
+ update for TDS 1.1
+
+2004-08-18 Wed 01:56:12 +0000 kohler <kohler>
+Commit ed7fd464779e66342f5284827afac3b47631f7bc
+
+ * otftotfm/: kpseinterface.c, kpseinterface.h: add kpsei_var_value
+
+2004-08-11 Wed 00:43:51 +0000 kohler <kohler>
+Commit b08d797c2159a2d779209df28d4d02cffb5a0825
+
+ * NEWS, README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1testpage/t1testpage.1: to 2.9
+
+2004-08-10 Tue 07:27:28 +0000 kohler <kohler>
+Commit f73a4a277ac1baacb113fcf7eb07141656aa076a
+
+ * NEWS, configure.in, otftotfm/dvipsencoding.cc,
+ otftotfm/glyphfilter.cc, otftotfm/glyphfilter.hh,
+ otftotfm/metrics.cc, otftotfm/metrics.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/uniprop.cc, otftotfm/uniprop.hh,
+ otftotfm/util.cc, otftotfm/util.hh: support --letter-feature
+
+2004-08-05 Thu 08:07:53 +0000 kohler <kohler>
+Commit 97b65ca6134406c27f3d3a50bd23eab2e4e30f44
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/metrics.cc,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1testpage/t1testpage.1: to 2.8: catch thrown
+ errors from Gsub and Gpos constructors
+
+2004-08-04 Wed 01:23:10 +0000 kohler <kohler>
+Commit 7cc19420428f2ce4234ceaefffec5af0604b64c3
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 2.7
+
+2004-07-13 Tue 02:15:53 +0000 kohler <kohler>
+Commit a8c5a81faca23d8f514e7f23e273bef8abdb8fdd
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ versionize
+
+2004-07-13 Tue 02:13:20 +0000 kohler <kohler>
+Commit 504c09d9e589d243aa1ee85f1c0eb3e2bfec8eab
+
+ * t1testpage/: t1testpage.1, t1testpage.cc: t1testpage adds --glyph
+ and --smoke options
+
+2004-07-13 Tue 02:12:04 +0000 kohler <kohler>
+Commit 0da871b6ee6bfa13fb3205185b0c76711a62c31f
+
+ * Makefile.am, liblcdf/Makefile.am, otftotfm/dvipsencoding.hh,
+ otftotfm/util.cc, otftotfm/util.hh: liblcdf adds globmatch
+
+2004-07-06 Tue 23:57:16 +0000 kohler <kohler>
+Commit 377ea5a5d652511ae733784d4c7a1094149593eb
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ version update
+
+2004-06-30 Wed 16:56:04 +0000 kohler <kohler>
+Commit bdd6aa3925edfd6b201826b0d67d8e4e4786f87d
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ to 2.4
+
+2004-06-16 Wed 06:51:39 +0000 kohler <kohler>
+Commit 440ff4fa5fb16cc614aa8af1a48d1816e17a43df
+
+ * glyphlist.txt, otftotfm/secondary.cc, otftotfm/secondary.hh:
+ support F{F,I,L,FI,FL}small (Ulrich Dirr)
+
+2004-06-16 Wed 04:56:40 +0000 kohler <kohler>
+Commit 08f953d49a9f25e6bcfe1efdb75aa6a906c413bf
+
+ * otftotfm/dvipsencoding.cc: comment update
+
+2004-06-16 Wed 04:55:26 +0000 kohler <kohler>
+Commit 2227d42831ed609ab995a5f3577fe369dbf94a88
+
+ * otftotfm/: dvipsencoding.cc, dvipsencoding.hh, metrics.cc,
+ metrics.hh, otftotfm.cc, secondary.cc, secondary.hh: store Unicode
+ information in Metrics, not DvipsEncoding
+
+2004-06-16 Wed 04:54:14 +0000 kohler <kohler>
+Commit 256da124687374021b9c941529ece50024b7185a
+
+ * otftotfm/: Makefile.am, glyphfilter.cc, glyphfilter.hh: add
+ glyphfilter
+
+2004-06-16 Wed 04:53:34 +0000 kohler <kohler>
+Commit 8dbbe4badaf402b5e1ff7e56858f1375ce99cc49
+
+ * mkuniprop.pl, otftotfm/uniprop.cc, otftotfm/uniprop.hh: add
+ parse_property
+
+2004-06-15 Tue 16:32:39 +0000 kohler <kohler>
+Commit 0b23344ae5d5a9a909f48ecb0ee421bd7571946a
+
+ * otftotfm/otftotfm.1: doc nits
+
+2004-06-15 Tue 16:27:50 +0000 kohler <kohler>
+Commit 853363564b1835a5f99dedee2bfaa1e77e0cb59a
+
+ * otftotfm/otftotfm.1: nit
+
+2004-06-15 Tue 16:26:19 +0000 kohler <kohler>
+Commit 19d65473c8f9af65e9ca2a1dcb80fc44b78e6860
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 2.3: --default-ligkern et al
+
+2004-06-15 Tue 04:01:17 +0000 kohler <kohler>
+Commit c8eb905fadc410764c26b3e86aceb8791f32bdf7
+
+ * mkuniprop.pl, otftotfm/uniprop.cc, otftotfm/uniprop.hh: add
+ UnicodeProperty
+
+2004-05-27 Thu 05:42:54 +0000 kohler <kohler>
+Commit 5ff7de9fcc5e35772bf1837ebd8b49d93d8f8333
+
+ * README: update README
+
+2004-05-08 Sat 16:32:25 +0000 kohler <kohler>
+Commit bfe772dd439e90c5f7f4eb634b912ea85ce4cdcb
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ bump version
+
+2004-05-08 Sat 16:31:36 +0000 kohler <kohler>
+Commit 4aa42f9ebe23b11d10fcb56625d90902a1517955
+
+ * otftotfm/: automatic.cc, otftotfm.cc, secondary.cc, secondary.hh,
+ util.hh: pay attention to t1dotlessj exit status and use a regular
+ "j" as a dotless "j" if no dot was found. Also support "--force"
+ (untested), and make t1dotlessj errors into warnings (so that
+ otftotfm finishes all of its tasks even if t1dotlessj bombs out,
+ reported by Stephen Moye)
+
+2004-05-08 Sat 16:29:35 +0000 kohler <kohler>
+Commit ce4adc0d58a61e354f9d044bd382940c6f83197a
+
+ * t1dotlessj/: t1dotlessj.1, t1dotlessj.cc: exit with different
+ status depending on the error
+
+2004-04-18 Sun 20:15:58 +0000 kohler <kohler>
+Commit b09fb4240f5f92fcb2f73accddeac7caa34dbb3f
+
+ * otftotfm/otftotfm.1: improve -faalt description
+
+2004-04-05 Mon 10:25:40 +0000 kohler <kohler>
+Commit bca895ee51bae7b8545613e9f52c97b8fbb1c09c
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 2.1: improve documentation for
+ otftotfm; otftotfm warns on missing encoding file
+
+2004-03-28 Sun 18:46:33 +0000 kohler <kohler>
+Commit 31da5312fe8fb5578b3d289b009259396c847679
+
+ * glyphlist.txt: add fontinst synonyms
+
+2004-03-22 Mon 03:45:57 +0000 kohler <kohler>
+Commit d9e7f735ef30f8abf69caaa3b6e3cd29e688ab35
+
+ * NEWS, ONEWS, README, cfftot1/cfftot1.1, cfftot1/cfftot1.cc,
+ cfftot1/maket1font.cc, configure.in, mmafm/main.cc, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, mmpfb/myfont.cc, mmpfb/t1minimize.cc,
+ mmpfb/t1rewrit.cc, otfinfo/otfinfo.1, otfinfo/otfinfo.cc,
+ otftotfm/automatic.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/metrics.cc, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ otftotfm/secondary.cc, otftotfm/util.cc, t1dotlessj/t1dotlessj.1,
+ t1lint/cscheck.cc, t1lint/t1lint.1, t1testpage/t1testpage.1: to
+ 2.0, and update copyrights
+
+2004-03-22 Mon 03:36:49 +0000 kohler <kohler>
+Commit 1fa171677969ab4242faad9c3f0bea41f419142e
+
+ * mmpfb/main.cc, t1dotlessj/t1dotlessj.cc, t1lint/t1lint.cc,
+ t1testpage/t1testpage.cc: add _O_BINARY flag on Windows when
+ appropriate; also update copyright
+
+2004-02-24 Tue 19:38:14 +0000 kohler <kohler>
+Commit 7a9d5b2eec6ffb9861e43451749a064ec78929d5
+
+ * otftotfm/: metrics.cc, otftotfm.1: nits
+
+2004-02-24 Tue 19:20:57 +0000 kohler <kohler>
+Commit fd1de79a1062fe1e55aaad0298a217f7e661208f
+
+ * README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ to 1.99
+
+2004-02-24 Tue 19:18:14 +0000 kohler <kohler>
+Commit 36769b0c731855ca59657d49db399074e250cc14
+
+ * NEWS, otftotfm/metrics.cc: small change improves performance a
+ lot: don't do unnecessary work
+
+2004-02-24 Tue 18:43:25 +0000 kohler <kohler>
+Commit 38b7074a08118a4dddd3cd1c26e169ed30916423
+
+ * otftotfm/: metrics.cc, otftotfm.cc: fix bug reported by Adam
+ Lindsay: a context ligature was included even though it referred to
+ a nonexistent character
+
+2004-02-24 Tue 18:08:53 +0000 kohler <kohler>
+Commit 0c157b2dc53f5560fa68fb9926277147f74540bb
+
+ * otftotfm/metrics.cc: a better error message
+
+2004-02-22 Sun 09:37:16 +0000 kohler <kohler>
+Commit 73239b39b65544e2da3d893beda2abeb4d74a483
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ to version 1.98
+
+2004-02-22 Sun 09:33:55 +0000 kohler <kohler>
+Commit 78857ff5c7ec8271ad468f349bd634b11220043f
+
+ * glyphlist.txt, otftotfm/dvipsencoding.cc, otftotfm/secondary.cc:
+ add support for SSsmall (Einar Smith)
+
+2004-02-22 Sun 09:32:25 +0000 kohler <kohler>
+Commit 11f45b17a09691676125660b55b6d19e1393a491
+
+ * otftotfm/: automatic.cc, automatic.hh, otftotfm.cc, util.cc,
+ util.hh: rename nocreate to no_create to fix compilation problems
+ (reported by Nelson Beebe)
+
+2004-02-07 Sat 05:47:25 +0000 kohler <kohler>
+Commit d313c4d34fb87bd608e960d7d8c5f4481fdc986c
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ to 1.97
+
+2004-01-11 Sun 21:02:17 +0000 kohler <kohler>
+Commit c41a53ecbfa529c26d9a3e6dc3c1059083ff618e
+
+ * otftotfm/dvipsencoding.cc: C++-style string iteration
+
+2004-01-11 Sun 20:52:12 +0000 kohler <kohler>
+Commit c6a12447b412b05c4c48954b36396dcf17770a14
+
+ * README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1,
+ t1lint/t1lint.1, t1testpage/t1testpage.1: versionize
+
+2004-01-11 Sun 20:51:59 +0000 kohler <kohler>
+Commit 8edf23d12e20aa4f00fc8c72c2cccbdca74adc5e
+
+ * NEWS, configure.in, otftotfm/dvipsencoding.cc: to 1.96: respect
+ "Q.alt" and the like in input encoding
+
+2004-01-05 Mon 16:35:37 +0000 kohler <kohler>
+Commit f731c8f4257f6a4e75524dd4896374ae6ffc20bc
+
+ * t1dotlessj/t1dotlessj.cc: font_name fix for Forte C++, from Tom
+ Kacvinsky
+
+2004-01-04 Sun 06:18:38 +0000 kohler <kohler>
+Commit 15c3ba9a81485ba3ed7c01b3597e4fb63cfd548f
+
+ * otftotfm/otftotfm.1: mention t1dotlessj in SEE ALSO
+
+2004-01-04 Sun 05:48:39 +0000 kohler <kohler>
+Commit 35950fc6261876e0a6b903a60c4b9dc6f1274fe6
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/Makefile.am,
+ otftotfm/otftotfm.1, t1dotlessj/t1dotlessj.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 1.95
+
+2004-01-04 Sun 05:48:39 +0000 kohler <kohler>
+Commit 5706a6890fdc4da3f7143e6915953565bb87552d
+
+ * otftotfm/otftotfm.1: to 1.95
+
+2004-01-04 Sun 05:48:27 +0000 kohler <kohler>
+Commit 1873bd75178a5507ec64177fc18fde691642e0a6
+
+ * otftotfm/: secondary.cc, secondary.hh: support dotless-j
+ generation
+
+2004-01-04 Sun 05:47:57 +0000 kohler <kohler>
+Commit fd2fd30488272721c9349d012acbdc016aaed5f8
+
+ * otftotfm/: otftotfm.cc, otftotfm.hh: support virtual fonts that
+ refer to more than one base font (for dotless-j support); avoid bad
+ "(STOP)" commands; refactor code to introduce output_metrics()
+ function (used by dotless-j support)
+
+2004-01-04 Sun 05:45:25 +0000 kohler <kohler>
+Commit c1f30690a0438f90819a153bc07f95b93c8ebb31
+
+ * otftotfm/: metrics.cc, metrics.hh: add design_units(); and
+ support multiple fonts: add Setting::FONT, and a mapped_fonts()
+ array
+
+2004-01-04 Sun 05:44:21 +0000 kohler <kohler>
+Commit 6db84c455288702d2a09247c9d07f53c1b92cfb4
+
+ * otftotfm/: dvipsencoding.cc, dvipsencoding.hh: nits, including a
+ fix for glyphlist.txt multi-possibility lines (like
+ "dotlessj;0237;FB36"); use String::iterator; adapt to Secondary
+ changes
+
+2004-01-04 Sun 05:42:40 +0000 kohler <kohler>
+Commit 703a41148fec79261088cdeb61eab2c3ce47f193
+
+ * otftotfm/automatic.cc: create Type 1 fonts even in non-automatic
+ mode, and jigger error messages
+
+2003-12-31 Wed 18:42:51 +0000 kohler <kohler>
+Commit 59ee957c3b9c12ae6b40a9d89f4140e7a6a23dce
+
+ * NEWS, configure.in, otftotfm/automatic.cc, otftotfm/automatic.hh,
+ otftotfm/metrics.cc, otftotfm/metrics.hh, otftotfm/otftotfm.cc,
+ otftotfm/secondary.cc: to 1.91
+
+2003-12-30 Tue 22:39:45 +0000 kohler <kohler>
+Commit c9806fa1c3457f27e421509c1f370312594f2e0d
+
+ * t1dotlessj/t1dotlessj.cc: nit
+
+2003-12-30 Tue 22:39:09 +0000 kohler <kohler>
+Commit 345f3f55e68fec73df69049bbc457d7c5b58863a
+
+ * t1dotlessj/: Makefile.am, t1dotlessj.cc: to version 1.90: include
+ t1dotlessj.1, some updates also to the code
+
+2003-12-30 Tue 22:37:21 +0000 kohler <kohler>
+Commit 99210dfc53fda5a5e54469f619c6f430e89918dd
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1dotlessj/t1dotlessj.1, t1lint/t1lint.1, t1testpage/t1testpage.1:
+ to version 1.90
+
+2003-12-29 Mon 10:01:42 +0000 kohler <kohler>
+Commit 86a45c7dfe69ba4209cdbc767fc476eed09713fd
+
+ * Makefile.am, configure.in, t1dotlessj/.cvsignore,
+ t1dotlessj/Makefile.am, t1dotlessj/t1dotlessj.cc: add t1dotlessj
+
+2003-12-29 Mon 10:01:15 +0000 kohler <kohler>
+Commit 85dffac11e0e6e5f1d60cb63afb272eaec43ba66
+
+ * t1lint/cscheck.cc: adapt to _careful change: t1lint should be
+ careful
+
+2003-12-29 Mon 10:00:43 +0000 kohler <kohler>
+Commit 94368c2eeb9c7f00309c068a34b88e6a7549212a
+
+ * cfftot1/maket1font.cc, mmpfb/t1minimize.cc: adapt to
+ Type1CharstringGenInterp changes
+
+2003-12-28 Sun 18:32:13 +0000 kohler <kohler>
+Commit 80e0a201ff9f0f980f31b05beade2762123f69ce
+
+ * cfftot1/maket1font.cc: use Type1CharstringGenInterp
+
+2003-12-28 Sun 08:23:04 +0000 kohler <kohler>
+Commit bfe302849c56c8b6538519f7f9e92e75df3c30c3
+
+ * NEWS, cfftot1/maket1font.cc, libefont/Makefile.am,
+ mmpfb/t1minimize.cc: adapt to t1font::skeleton stuff
+
+2003-12-23 Tue 19:09:05 +0000 kohler <kohler>
+Commit 315a3735eb5d4772436ee70b95d3a7199fbc523d
+
+ * README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 1.88
+
+2003-12-23 Tue 19:08:02 +0000 kohler <kohler>
+Commit c8986b35fa527222dad33267e1ba40d9bda0ff31
+
+ * NEWS, configure.in, otfinfo/otfinfo.cc: 1.88: use more STL
+ instead of homegrown find() template for compatibility with older
+ GCCs
+
+2003-12-23 Tue 19:07:27 +0000 kohler <kohler>
+Commit ac52cff81c800c033d5e4776becff593421c2bab
+
+ * README, cfftot1/cfftot1.1, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ otfinfo/otfinfo.1, otftotfm/otftotfm.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 1.87
+
+2003-12-23 Tue 05:43:43 +0000 kohler <kohler>
+Commit d584f61787b422144775b647eb953f0aecc4bfae
+
+ * NEWS, configure.in, otftotfm/otftotfm.cc, otftotfm/secondary.cc,
+ otftotfm/secondary.hh: fix Ulrich Dirr --extend bug: extend factor
+ was applied to font height, not width; and apply extend factor to
+ XHEIGHT SPACE and other font dimensoins
+
+2003-12-19 Fri 18:22:30 +0000 kohler <kohler>
+Commit 0682b09475fc629633d09c49629cd1df20f1066e
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1lint/t1lint.1, t1testpage/t1testpage.1: to
+ 1.86
+
+2003-12-11 Thu 01:40:00 +0000 kohler <kohler>
+Commit 56fab397376cf116be2b685b81e62ee2eaf8302d
+
+ * otftotfm/otftotfm.1: oopslet
+
+2003-12-10 Wed 20:20:16 +0000 kohler <kohler>
+Commit 1bb73a911b7381f172003b5aed25d326dc750865
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: versionize
+
+2003-12-10 Wed 20:20:07 +0000 kohler <kohler>
+Commit fa98efc66120f40dd8940fac997619aa009736c4
+
+ * otftotfm/: otftotfm.1, otftotfm.cc: add --altselector-feature
+ mechanism; default to salt+dlig, not aalt+dlig; allow
+ --altselector=CHAR and --altselector-char=CHAR instead of numbers
+
+2003-12-10 Wed 20:18:55 +0000 kohler <kohler>
+Commit d7d208eec18c695d264c56ebe19b765d632b0cdb
+
+ * otftotfm/automatic.cc: oops: fix intermittend hang caused by
+ bonehead error
+
+2003-12-05 Fri 18:22:57 +0000 kohler <kohler>
+Commit dfc2cd231b3443b8724513c870ea467e88391cee
+
+ * otftotfm/otftotfm.1: a/an nit
+
+2003-12-05 Fri 01:33:49 +0000 kohler <kohler>
+Commit d88cdee8588a81b7f8fb1ea521e0bf83110ba544
+
+ * NEWS, glyphlist.txt: fix Ulrichs problem with SS
+
+2003-12-05 Fri 01:13:46 +0000 kohler <kohler>
+Commit 61e863f36fd328d9cf391f3928edf7939f7e6b7e
+
+ * otftotfm/metrics.cc: alternates bitlet
+
+2003-12-05 Fri 01:02:26 +0000 kohler <kohler>
+Commit ace92be62a4bcf973017de0c7d258a4716688868
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, glyphlist.txt,
+ mmafm/mmafm.1, mmpfb/mmpfb.1, otfinfo/otfinfo.1,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/metrics.cc, otftotfm/metrics.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/secondary.cc, otftotfm/secondary.hh,
+ otftotfm/util.cc, otftotfm/util.hh, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to 1.80: support --altselector-char,
+ --include-alternates, and --exclude-alternates
+
+2003-12-04 Thu 01:19:50 +0000 kohler <kohler>
+Commit a87ce7ce09094772515d6560af8598b89495efa0
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ t1lint/t1lint.1, t1testpage/t1testpage.1: to 1.75; only changes to
+ NEWS (bug fix was in library)
+
+2003-12-01 Mon 19:33:57 +0000 kohler <kohler>
+Commit 0a94c65370c7b82eeb6aa0a0cd143f5486630d5e
+
+ * configure.in: check explicitly for fabs
+
+2003-12-01 Mon 19:28:58 +0000 kohler <kohler>
+Commit 3ec54b0d7a48e651c896413c468e089de342874e
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/main.cc,
+ mmafm/mmafm.1, mmpfb/mmpfb.1, otfinfo/otfinfo.1,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to version 1.70: add --min-kern to
+ otftotfm; add --min-kern synonym to mmafm
+
+2003-11-29 Sat 17:48:50 +0000 kohler <kohler>
+Commit 055ae17a9d45b4d00d999321307bc6943787be08
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, t1lint/t1lint.1, t1testpage/t1testpage.1: to
+ 1.67: fix minor bug reported/patch provided/ by Akira Kakuto
+
+2003-11-24 Mon 17:53:10 +0000 kohler <kohler>
+Commit d2ada0b6e4fba823c1d835b22a5b9ae51d511ba1
+
+ * NEWS, README, cfftot1/cfftot1.1, cfftot1/maket1font.cc,
+ configure.in, mmafm/mmafm.1, mmpfb/mmpfb.1, otfinfo/otfinfo.1,
+ otftotfm/otftotfm.1, t1lint/t1lint.1, t1testpage/t1testpage.1: to
+ 1.66: currentfile eexec duplication
+
+2003-11-24 Mon 15:50:22 +0000 kohler <kohler>
+Commit 34fe3c74ea99cfbce443315bb6d365ca0ef76cd4
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otfinfo/otfinfo.1, otftotfm/automatic.cc,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc, t1lint/t1lint.1,
+ t1testpage/t1testpage.1: to version 1.65
+
+2003-11-17 Mon 03:24:00 +0000 kohler <kohler>
+Commit 6756a7274455bc5c80ae1747fbb7e619f13f9b8c
+
+ * otftotfm/metrics.hh: adapt to newer Vector
+
+2003-11-08 Sat 19:23:53 +0000 kohler <kohler>
+Commit e36e1ee2ca63207f8cdc1ea3e041ec92a21a1c11
+
+ * cfftot1/cfftot1.cc, otftotfm/otftotfm.cc: support for CID-keyed
+ CFF fonts
+
+2003-10-22 Wed 00:39:02 +0000 kohler <kohler>
+Commit a98a5dcdd1aabadab8009c5556243f7622a35689
+
+ * mmafm/mmafm.1: mention multiple master metrics archive
+
+2003-10-17 Fri 22:58:34 +0000 kohler <kohler>
+Commit c92fa09a9e0028e127cfd5fe44fecd49acfd43a8
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1,
+ cfftot1/maket1font.cc, configure.in, mmafm/mmafm.1, mmpfb/mmpfb.1,
+ mmpfb/t1rewrit.cc, mmpfb/t1rewrit.hh, otfinfo/otfinfo.1,
+ otftotfm/automatic.cc, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ otftotfm/secondary.cc, t1lint/cscheck.cc, t1lint/cscheck.hh,
+ t1lint/t1lint.1, t1lint/t1lint.cc, t1testpage/t1testpage.1:
+ versionization, and cope with efont changes
+
+2003-10-03 Fri 02:45:14 +0000 kohler <kohler>
+Commit d93abccc7c924765305a5a0a03ed97e923e1ffe4
+
+ * otftotfm/otftotfm.1: minor man page update
+
+2003-09-04 Thu 17:53:57 +0000 kohler <kohler>
+Commit 9c321dc58b46205975cd1e50d4da13d6ef59a2f7
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otftotfm/otftotfm.1, t1testpage/t1testpage.1:
+ versionize
+
+2003-09-04 Thu 17:50:38 +0000 kohler <kohler>
+Commit 8ffb7f7432195781342bb40f1c5abf68badcfbb3
+
+ * t1lint/t1lint.1: oops
+
+2003-09-04 Thu 17:49:08 +0000 kohler <kohler>
+Commit f93d84ae2fb8a69e02fd54fe32422ecdb6fa24cd
+
+ * otftotfm/: otftotfm.1, otftotfm.cc: add --design-size option
+
+2003-09-04 Thu 17:48:55 +0000 kohler <kohler>
+Commit 209af99edd796c62cdcb91c131c3a5fac962973b
+
+ * t1testpage/: Makefile.am, t1testpage.1, t1testpage.cc: fix --help
+ and add manual page
+
+2003-09-04 Thu 17:48:47 +0000 kohler <kohler>
+Commit cd7657bc076382b9a5504ce8cd5480a6be93af2e
+
+ * mmafm/main.cc, mmpfb/main.cc: name nit
+
+2003-09-02 Tue 22:16:35 +0000 kohler <kohler>
+Commit bd63d3b617bff12734da981b842cc421fbde290e
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, mmafm/mmafm.1,
+ mmpfb/mmpfb.1, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1lint/t1lint.1: set DESIGNSIZE to the font's actual design size,
+ from the "size" feature
+
+2003-08-29 Fri 03:31:35 +0000 kohler <kohler>
+Commit a76028737bdaededbd1c7d2d24d72410f90ae12e
+
+ * cfftot1/cfftot1.cc, mmafm/main.cc, mmpfb/main.cc,
+ otfinfo/otfinfo.cc, otftotfm/otftotfm.cc, t1lint/t1lint.cc,
+ t1testpage/t1testpage.cc: update type of main()
+
+2003-08-26 Tue 22:26:15 +0000 kohler <kohler>
+Commit d7ef8ba5c626a3481db02e51e925ed14e7ebcefa
+
+ * NEWS, README, cfftot1/Makefile.am, cfftot1/cfftot1.1,
+ configure.in, libefont/Makefile.am, liblcdf/Makefile.am,
+ mmafm/Makefile.am, mmafm/mmafm.1, mmpfb/Makefile.am, mmpfb/mmpfb.1,
+ otfinfo/Makefile.am, otfinfo/otfinfo.cc, otftotfm/Makefile.am,
+ otftotfm/otftotfm.1, t1lint/Makefile.am, t1lint/t1lint.1,
+ t1testpage/Makefile.am: release 1.50
+
+2003-08-25 Mon 20:05:48 +0000 kohler <kohler>
+Commit 06d23cfa093f6e6810d0139dc0b72af560e2471f
+
+ * NEWS: more news
+
+2003-08-25 Mon 18:44:41 +0000 kohler <kohler>
+Commit 48d1664805c981750f99304c2cb270f11c0dbcb7
+
+ * NEWS, configure.in, otftotfm/automatic.cc: KPATHSEA screwup
+
+2003-08-25 Mon 00:28:00 +0000 kohler <kohler>
+Commit 371ba5074490cfdd4d5e14438da6cc60fd606b86
+
+ * NEWS, README: update NEWS
+
+2003-08-25 Mon 00:21:50 +0000 kohler <kohler>
+Commit b52482d26af5e1f6ef4db3b050bd2e69348bbca9
+
+ * otfinfo/otfinfo.cc: nit
+
+2003-08-25 Mon 00:20:30 +0000 kohler <kohler>
+Commit 940d06916b7e529a58ad32bbc1e36ac2df230f49
+
+ * Makefile.am, README, cfftot1/cfftot1.1, libefont/Makefile.am,
+ mmafm/mmafm.1, mmpfb/mmpfb.1, otfinfo/otfinfo.1,
+ otfinfo/otfinfo.cc, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ t1lint/t1lint.1: versionize; move --query-scripts and
+ --query-features out of otftotfm; otfinfo manpage rework
+
+2003-08-24 Sun 21:49:04 +0000 kohler <kohler>
+Commit 34f86ac167fcda61155cee91d4fad701ebb03ebc
+
+ * otfinfo/otfinfo.cc, otftotfm/otftotfm.cc: use new interfaces
+
+2003-08-24 Sun 21:31:32 +0000 kohler <kohler>
+Commit 28cae8c01cd7047ac0037554feba5801a272d151
+
+ * otftotfm/metrics.cc: fix bug reported by Adam Lindsay with
+ non-boundarychar encodings
+
+2003-08-24 Sun 21:13:25 +0000 kohler <kohler>
+Commit ff48d6ad1421aae1859e61f883b903f687802235
+
+ * cfftot1/cfftot1.cc, mmafm/main.cc, mmpfb/main.cc,
+ otfinfo/.cvsignore, otfinfo/otfinfo.cc, otftotfm/automatic.cc,
+ otftotfm/metrics.hh, otftotfm/otftotfm.cc, t1lint/t1lint.cc,
+ t1testpage/t1testpage.cc: Tom Kacvinsky provides patches for
+ Solaris
+
+2003-08-23 Sat 22:46:51 +0000 kohler <kohler>
+Commit 0c7c0e3b6dac7c3059c53f1992d162b4e957fdec
+
+ * Makefile.am, configure.in: support recent changes
+
+2003-08-23 Sat 22:46:48 +0000 kohler <kohler>
+Commit 8aa44b49adaa3acfd869df04759468f1cb55a046
+
+ * otftotfm/: automatic.cc, automatic.hh, otftotfm.1, otftotfm.cc,
+ secondary.cc: run TEXMF/dvips/updmap if present when appropriate
+
+2003-08-23 Sat 22:46:08 +0000 kohler <kohler>
+Commit fa5f436aa3d2cb21576f4d80b8be3d33e2e39b85
+
+ * cfftot1/cfftot1.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/metrics.cc, otftotfm/util.cc, t1lint/t1lint.cc,
+ t1testpage/t1testpage.cc: revert #include style for C includes
+
+2003-08-23 Sat 22:11:31 +0000 kohler <kohler>
+Commit 4d0583aa6756d661b979f238278fefc36bfc9a07
+
+ * otfinfo/: Makefile.am, otfinfo.1, otfinfo.cc: add preliminary
+ otfinfo
+
+2003-08-20 Wed 20:39:26 +0000 kohler <kohler>
+Commit 8d98eb7dc3dd48a5600c49e61c34746daec23367
+
+ * mmafm/main.cc, mmpfb/main.cc: s/mminstance/typetools/
+
+2003-08-20 Wed 19:34:15 +0000 kohler <kohler>
+Commit 746fa20439fa5b1d9a7e0f35fbe2efb0492b333c
+
+ * Makefile.am, NEWS, ONEWS, README, cfftot1/cfftot1.1,
+ configure.in, mmafm/mmafm.1, mmpfb/mmpfb.1, otftotfm/otftotfm.1,
+ t1lint/Makefile.am, t1lint/t1lint.1, t1lint/t1lint.cc: add manual
+ page for t1lint and fix its --help; integrate mmafm and mmpfb
+
+2003-08-15 Fri 00:05:23 +0000 kohler <kohler>
+Commit b6780a064105324a286112b9eacf2098be28bbfb
+
+ * configure.in, otftotfm/automatic.cc, otftotfm/dvipsencoding.hh,
+ t1lint/cscheck.cc, t1testpage/t1testpage.cc: compilation fixes
+
+2003-08-14 Thu 23:54:54 +0000 kohler <kohler>
+Commit 4925832f0cea87879986e997958b35d443b31849
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/main.cc, mmpfb/mmpfb.1,
+ mmpfb/myfont.cc, mmpfb/t1minimize.cc, mmpfb/t1rewrit.cc:
+ compatibility changes from Fabrice
+
+2003-08-12 Tue 21:49:33 +0000 kohler <kohler>
+Commit 15343ca602d7c11989683774136450e27cb65d3f
+
+ * cfftot1/maket1font.cc, configure.in, otftotfm/automatic.cc,
+ otftotfm/md5.c, otftotfm/metrics.hh, otftotfm/otftotfm.cc,
+ otftotfm/secondary.hh: fabrice popineau patches
+
+2003-08-11 Mon 20:47:01 +0000 kohler <kohler>
+Commit c067c594514793d491de7a35c8ab390d5b2ad1fc
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: to 1.26.1
+
+2003-08-10 Sun 22:52:45 +0000 kohler <kohler>
+Commit a31884e4b8cdb1670e6dd016afc83743744a8a86
+
+ * configure.in, t1lint/t1lint.cc: minor configury
+
+2003-08-10 Sun 21:39:52 +0000 kohler <kohler>
+Commit 9bc332a35787496ed26687763eb7bdf1e80884d5
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: Beebenits configury etc.
+
+2003-08-10 Sun 18:46:03 +0000 kohler <kohler>
+Commit b78f6acd2c60a46717a6bef4559dfb48083fed31
+
+ * otftotfm/otftotfm.1: thank Marco in the manpage
+
+2003-08-10 Sun 18:42:55 +0000 kohler <kohler>
+Commit 6425bc13e479898e0920fbc1e5f83731f42c0afc
+
+ * Makefile.am, README, cfftot1/cfftot1.1, otftotfm/otftotfm.1:
+ versionize to 0.53
+
+2003-08-10 Sun 18:38:27 +0000 kohler <kohler>
+Commit 930db3f8fc8399a60ebec923ebd2ca9fb3b4f4e2
+
+ * NEWS, configure.in, otftotfm/metrics.cc, otftotfm/otftotfm.1: fix
+ emptyslot bug reported by Marco
+
+2003-08-10 Sun 17:45:04 +0000 kohler <kohler>
+Commit f2c5221422bc452aa4a19da76338c093696ae5a0
+
+ * NEWS, otftotfm/automatic.cc, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: integrate Adams suggested changes: fix
+ cfftot1 invocation with --without-kpathsea, include OTF file when
+ theres no T1 file
+
+2003-08-07 Thu 20:50:58 +0000 kohler <kohler>
+Commit fc9b31e1e01d0e67674a8c19cabdad4977f232b8
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/mmpfb.1: build updates to try
+ to address problems reported by Nelson Beebe
+
+2003-08-07 Thu 20:43:12 +0000 kohler <kohler>
+Commit 0391db2e578552fb57e4304b6d0abceceb6642af
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1, configure.in,
+ libefont/Makefile.am, liblcdf/Makefile.am, otftotfm/otftotfm.1: to
+ version 0.52
+
+2003-08-07 Thu 19:56:03 +0000 kohler <kohler>
+Commit 8da5b9a8a09a50844dcb8dd4b06902788c3a8c04
+
+ * NEWS, configure.in, otftotfm/kpseinterface.c,
+ otftotfm/kpseinterface.h, otftotfm/metrics.cc, otftotfm/metrics.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc: to version 0.51bis (the
+ bis is a teensy configure.in problemlet): fix crashes with small
+ encodings, add --boundary-char and --kpathsea-debug
+
+2003-08-04 Mon 20:26:08 +0000 kohler <kohler>
+Commit 67ac2bcc94b7e49214c53dcf5e55e0999b44d12a
+
+ * otftotfm/: metrics.cc, metrics.hh: fix ExPontoPro issue: LIG_LIVE
+ was inappropriate, and when you detect characters used in
+ context-only ligatures, you need to redetermine reachability
+
+2003-08-04 Mon 19:53:55 +0000 kohler <kohler>
+Commit 86784ffd4980f7b84b383501e374f90dd427086e
+
+ * otftotfm/otftotfm.1, showings/.cvsignore: manpage nits
+
+2003-08-04 Mon 19:50:43 +0000 kohler <kohler>
+Commit 31fb9f3594b0dd06956b77b20fd2d68678b55611
+
+ * glyphlist.txt: slight glyphlist modification: prefer Delta and
+ Omega to Deltagreek and Omegagreek
+
+2003-08-04 Mon 19:47:51 +0000 kohler <kohler>
+Commit 2d016cb14000ee2f7e76cff2ec8604705a6d9e76
+
+ * NEWS: update NEWS
+
+2003-08-04 Mon 19:42:44 +0000 kohler <kohler>
+Commit e694ead682a61d562a7e3e780c14ba1d850bc803
+
+ * showings/: Makefile, MinionPro-It-features.tex,
+ MinionPro-Regular-features.tex, WarnockPro-It-features.tex,
+ WarnockPro-Regular-features.tex, features.tex: add showings
+ directory
+
+2003-08-04 Mon 19:42:37 +0000 kohler <kohler>
+Commit 2266e71bee55b757ef84b78c2136b6afcce0e336
+
+ * otftotfm/metrics.cc: better ChangedContext structure fixes "1st"
+ problem; previously, the ssuperior character introduced by 1 s t =>
+ 1 ssuperior t was new, so changed context refused to implement the
+ 1 ssuperior t => 1 ssuperior tsuperior ligature
+
+2003-08-04 Mon 05:29:48 +0000 kohler <kohler>
+Commit 2fdd84586c0737cb2e13ecd008d36f3c78ca9a6e
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/metrics.cc, otftotfm/metrics.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: bump version; add lookup number check to
+ Metrics: prefer that to storing
+
+2003-08-03 Sun 05:34:00 +0000 kohler <kohler>
+Commit 23d47abf78302245d989710f55b1febc3ffaf091
+
+ * otftotfm/metrics.cc: nit
+
+2003-08-03 Sun 05:29:23 +0000 kohler <kohler>
+Commit f1df1774c8f61dff0341d00b7db2a7f5aaa3b4d3
+
+ * otftotfm/metrics.cc: be more careful about accepting
+ Substitutions
+
+2003-08-03 Sun 05:17:56 +0000 kohler <kohler>
+Commit 88668faaa383b7c44386a224996fa08ccf19f89f
+
+ * otftotfm/: gsubencoding.cc, gsubencoding.hh, metrics.cc,
+ metrics.hh, otftotfm.cc: new Metrics plan in place can handle
+ -fordn properly, and can stuff "base-only" characters on top of
+ "virtual-only" characters to save encoding space
+
+2003-08-02 Sat 01:50:12 +0000 kohler <kohler>
+Commit dff28c4d40d3785edf3bdeb5614e0413b26c4343
+
+ * otftotfm/: Makefile.am, dvipsencoding.cc, dvipsencoding.hh,
+ gsubencoding.cc, gsubencoding.hh, metrics.cc, metrics.hh,
+ otftotfm.cc, secondary.cc, secondary.hh: new Metrics plan (not
+ GsubEncoding); mostly for code cleanup
+
+2003-07-31 Thu 23:07:13 +0000 kohler <kohler>
+Commit 5e65ea4d2ccf87347402aaedb048868add1916bc
+
+ * otftotfm/: dvipsencoding.cc, gsubencoding.cc, gsubencoding.hh,
+ otftotfm.cc: new story for context ligatures focuses on fake
+ characters; perhaps easier to add complex context ligatures like
+ -ffrac. Sufficiently tested?
+
+2003-07-31 Thu 03:18:34 +0000 kohler <kohler>
+Commit f8fc9222a5c8248572c2734bac7a0cf8e6040cac
+
+ * NEWS, otftotfm/otftotfm.cc: nits
+
+2003-07-31 Thu 02:42:03 +0000 kohler <kohler>
+Commit e81e6b66d1ff68348eabbe35bcb9e2ade7da2c1c
+
+ * t1lint/: cscheck.cc, cscheck.hh, t1lint.cc: adapt to efont
+ changes
+
+2003-07-31 Thu 02:33:58 +0000 kohler <kohler>
+Commit e944e392d3d256cd70b5104b62a7ad4a7cf8af2b
+
+ * mmafm/mmafm.1: bump version number
+
+2003-07-31 Thu 02:33:41 +0000 kohler <kohler>
+Commit afb753a8541b274cdf532423c65da34d35801800
+
+ * mmpfb/: main.cc, mmpfb.1: make --minimize the default; and when
+ --minimize is on, force some values to integers
+
+2003-07-31 Thu 02:33:13 +0000 kohler <kohler>
+Commit 9d26f4921fd8943ef697a44c8227136e10d41dcd
+
+ * mmpfb/: myfont.cc, myfont.hh: add ability to round values to
+ integers
+
+2003-07-31 Thu 02:32:44 +0000 kohler <kohler>
+Commit 5d7edbdf52ecbd9f551b66d9bf7ebfc3d5055351
+
+ * mmpfb/t1minimize.cc: include font header comments even in
+ minimized fonts
+
+2003-07-30 Wed 23:49:12 +0000 kohler <kohler>
+Commit 138fd4294a1dd1e88da1a90059dc57da332b5ff8
+
+ * mmpfb/t1rewrit.cc: remove debugging
+
+2003-07-30 Wed 22:30:50 +0000 kohler <kohler>
+Commit 4d52166b3b539c41e702024915da2cd63eb8d8aa
+
+ * mmpfb/t1rewrit.cc: debugging
+
+2003-07-30 Wed 22:20:06 +0000 kohler <kohler>
+Commit 08d559651c5c969957ec3c6aeac3e6df638a21c5
+
+ * mmpfb/t1rewrit.cc: debugging
+
+2003-07-30 Wed 22:03:56 +0000 kohler <kohler>
+Commit d9a8d24989d19f3d975af4a09915a78786cfe80d
+
+ * mmpfb/t1rewrit.cc: debugging
+
+2003-07-30 Wed 21:29:16 +0000 kohler <kohler>
+Commit 86d2851121d1046fbe8a6fd223624c09c4d6a9be
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/myfont.hh,
+ mmpfb/t1rewrit.cc, mmpfb/t1rewrit.hh: adapt to libefont changes
+
+2003-07-30 Wed 18:57:44 +0000 kohler <kohler>
+Commit 4ca7c3e7a0f8e05552fa2fd850eb28188147792d
+
+ * configure.in: HAVE_ADDRESSABLE_VA_LIST configury
+
+2003-07-24 Thu 19:17:04 +0000 kohler <kohler>
+Commit 8c81cc37d4e929c51ce4a6880dbb88cd41b95882
+
+ * mmpfb/: t1rewrit.cc, t1rewrit.hh: use the global
+ Type1CharstringGen
+
+2003-07-15 Tue 13:43:56 +0000 kohler <kohler>
+Commit c819a99df4ee79fff5bb4ec4a2a6359e1ee115f0
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in, glyphlist.txt,
+ otftotfm/dvipsencoding.cc, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.1,
+ otftotfm/secondary.cc, otftotfm/secondary.hh: support "emptyslot"
+
+2003-07-09 Wed 21:55:07 +0000 kohler <kohler>
+Commit cd60a9e9bd9ec5f256f6fe56ec39d99d98897fe5
+
+ * NEWS: newslet
+
+2003-07-09 Wed 20:56:23 +0000 kohler <kohler>
+Commit 332b97c3a929095ba2dc97279788414ef716a034
+
+ * glyphlist.txt, otftotfm/otftotfm.1, otftotfm/secondary.cc,
+ otftotfm/secondary.hh: use correct Unicode code points for cwm
+ (zwnj) and visualspace; and document synthetic characters in the
+ man page
+
+2003-07-09 Wed 19:41:10 +0000 kohler <kohler>
+Commit be74ee466cb49ff220c5b4ce88f9a3a65e430506
+
+ * configure.in: to 0.18: configury for whether va_list is
+ addressable
+
+2003-07-09 Wed 19:37:23 +0000 kohler <kohler>
+Commit f881edf22e01f15217d1aef6c2d00a14cb70a83f
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: to 1.23: check whether va_list is
+ addressable
+
+2003-07-09 Wed 18:03:23 +0000 kohler <kohler>
+Commit ae4c6cbaaf77938371e07776b6886b20c72c94f6
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: to 0.18
+
+2003-07-09 Wed 17:31:28 +0000 kohler <kohler>
+Commit dffc563bff8fd35f2feac697178bc7ae98c26e9e
+
+ * otftotfm/otftotfm.cc: new CharstringBounds interface; and RULE
+ marks the boundser
+
+2003-07-09 Wed 17:09:19 +0000 kohler <kohler>
+Commit 0c206af70c8445fb3dc91777cd279ba055c8f208
+
+ * otftotfm/otftotfm.cc: avoid memory leak (why not)
+
+2003-07-09 Wed 17:07:57 +0000 kohler <kohler>
+Commit 733899e7f7009f5e85c7cd2eee44e8e9e05d8a93
+
+ * NEWS, otftotfm/Makefile.am, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.cc,
+ otftotfm/secondary.cc, otftotfm/secondary.hh: GsubEncoding supports
+ fake ligatures and other faked characters
+
+2003-07-09 Wed 17:02:41 +0000 kohler <kohler>
+Commit f97485d72170176ffd05734e23968020a580d07b
+
+ * otftotfm/: dvipsencoding.cc, dvipsencoding.hh: store unicodes()
+ for easy access, and make_gsub_encoding() can call a Secondary for
+ missing glyphs
+
+2003-07-09 Wed 17:01:04 +0000 kohler <kohler>
+Commit 724361329b1434cefa9dfba9205378ed945f5fef
+
+ * glyphlist.txt: add cwm, visualspace, and Germandbls
+
+2003-07-08 Tue 22:34:55 +0000 kohler <kohler>
+Commit de351fbcda28e38e9ea5b4f04c8c51bcfde80826
+
+ * configure.in: configury nitlets
+
+2003-07-08 Tue 22:25:03 +0000 kohler <kohler>
+Commit 8cd240e4cea602644db8a649ecf8d6fb5c31404e
+
+ * acconfig.h, configure.in: move to autoconf-2.57 whole hog
+
+2003-07-08 Tue 21:50:33 +0000 kohler <kohler>
+Commit 6920b5851de27ef5fdd27ca931ec59803148b1d4
+
+ * configure.in: <sys/types.h>
+
+2003-07-08 Tue 21:48:47 +0000 kohler <kohler>
+Commit 8956d31dae72a97f7c9e2c80708679d91ec076d7
+
+ * configure.in: add check for byteorder.h (Mingw32?)
+
+2003-07-07 Mon 19:50:22 +0000 kohler <kohler>
+Commit d86eb84c750101a281bff0299a1ce03ed514aff4
+
+ * otftotfm/otftotfm.cc: try to print reals so fontinst wont choke
+
+2003-07-07 Mon 19:50:08 +0000 kohler <kohler>
+Commit 345906665b24065ea8a8d48c882a631049a8b9a3
+
+ * glyphlist.txt: encode new dotlessj
+
+2003-07-07 Mon 16:31:41 +0000 kohler <kohler>
+Commit aa0e63d9ca77c39beda5f7dd1909daf439958fe5
+
+ * otftotfm/dvipsencoding.hh: support new-style glyphlist.txt, which
+ lists multiple possibilities for a glyph, and allow nonspaced
+ semicolons in LIGKERN/UNICODING, and fix infinite loop reported by
+ Marco
+
+2003-07-07 Mon 16:31:23 +0000 kohler <kohler>
+Commit 79811a6b55894ac23eec178ef6041229befbf5e1
+
+ * otftotfm/dvipsencoding.cc: support new-style glyphlist.txt, which
+ lists multiple possibilities for a glyph, and allow nonspaced
+ semicolons in LIGKERN/UNICODING
+
+2003-07-07 Mon 16:30:45 +0000 kohler <kohler>
+Commit c19302522b10fe2b161f62a72f63aa0cf756d961
+
+ * glyphlist.txt, texmathunicoding.txt: fold texmathunicoding.txt
+ (and Ng/ng encodings) into glyphlist.txt
+
+2003-07-07 Mon 03:02:45 +0000 kohler <kohler>
+Commit 78b8f3566b9d72cc6d8b76fc6f5956d833e2e22b
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc: to 0.17: improve
+ heuristics, remove LIGKERN-killed ligatures from encoding
+
+2003-07-06 Sun 23:25:30 +0000 kohler <kohler>
+Commit 4657fa1a7a33ce75837b5ce2b6ebbc9f115d3f68
+
+ * otftotfm/otftotfm.1: nit
+
+2003-07-06 Sun 23:20:51 +0000 kohler <kohler>
+Commit f84128aa1e0a8aea981bf95d283789951609b385
+
+ * NEWS: to version 0.16
+
+2003-07-06 Sun 21:37:37 +0000 kohler <kohler>
+Commit 6ad96a09feede539715ddc52544513f413c95591
+
+ * NEWS, texmathunicoding.txt: add texmathunicoding.txt
+
+2003-07-06 Sun 18:11:07 +0000 kohler <kohler>
+Commit 42e9dce5b5fb55f8cd1cf5a0582a96375df7a5fd
+
+ * NEWS, otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc: support --codingscheme
+ option; check for too-long and parenthesis-containing; document;
+ add --unicoding
+
+2003-07-06 Sun 18:11:07 +0000 kohler <kohler>
+Commit 2e578edf31dcee2593b0172ee69a5b6655cecf5d
+
+ * NEWS: support --codingscheme option; check for too-long and
+ parenthesis-containing; document; add --unicoding
+
+2003-07-06 Sun 07:09:55 +0000 kohler <kohler>
+Commit 67678774bd0239e8e565693823c452ee2689e9b2
+
+ * otftotfm/: dvipsencoding.cc, dvipsencoding.hh, gsubencoding.hh,
+ otftotfm.cc: % CODINGSCHEME support, and use different design units
+ to be friendlier to fontinst (Marco Kuhlmann)
+
+2003-07-05 Sat 21:10:59 +0000 kohler <kohler>
+Commit 976dcb09928132315c443718713f9f0b0b9685f2
+
+ * NEWS, otftotfm/automatic.cc, otftotfm/otftotfm.1: store dvips
+ files in TEXMF/dvips/VENDOR
+
+2003-07-05 Sat 20:54:11 +0000 kohler <kohler>
+Commit 9502b6657f0f7075c069818858a9abdebe2ca781
+
+ * otftotfm/: dvipsencoding.cc, dvipsencoding.hh, gsubencoding.cc,
+ gsubencoding.hh, otftotfm.cc: remove O(n^2) algorithms, and sort
+ ligatures by a preference score, so we include only the "best" ones
+ when there isnt encoding space for all
+
+2003-07-04 Fri 21:28:05 +0000 kohler <kohler>
+Commit c380ee5e52b790971d10ab97454662985b1bb480
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/otftotfm.1, otftotfm/otftotfm.cc: add --ligkern option,
+ and --automatic removes old .vf files
+
+2003-07-04 Fri 20:24:42 +0000 kohler <kohler>
+Commit 177125c0f1591d414298ff01dfb4d9c83095cd39
+
+ * cfftot1/cfftot1.1: make things clear
+
+2003-07-04 Fri 07:01:01 +0000 kohler <kohler>
+Commit 49252a170ae9231640e435d0211670e2af9fb423
+
+ * otftotfm/otftotfm.1: nit
+
+2003-07-04 Fri 06:59:19 +0000 kohler <kohler>
+Commit d43ce0a064fcf594e5f6fe88ba629ab1012f9189
+
+ * otftotfm/otftotfm.1: man page additions
+
+2003-07-04 Fri 06:47:56 +0000 kohler <kohler>
+Commit f8a112e93e8b773aa460c2fe8afe0b53f2d8674c
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: version update
+
+2003-07-04 Fri 06:47:26 +0000 kohler <kohler>
+Commit 561878027ee98cea35781438a0b222109db10ea0
+
+ * otftotfm/otftotfm.cc: clear out vectors of Substitutions and
+ Positionings to avoid re-application
+
+2003-07-03 Thu 21:31:36 +0000 kohler <kohler>
+Commit 833f046e413998775539b30841c917c71516dc22
+
+ * otftotfm/: Makefile.am, gsubencoding.cc, gsubencoding.hh,
+ otftotfm.cc: work towards ExPonto -fcalt
+
+2003-07-02 Wed 23:25:30 +0000 kohler <kohler>
+Commit cbe4cffa5da53d84bf2b7cabe6e79a7bebd868e7
+
+ * otftotfm/gsubencoding.cc: remove useless static function
+
+2003-07-02 Wed 23:21:17 +0000 kohler <kohler>
+Commit 3fa196ab79378b0207c0b5bbd6cd59600aecd2ba
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: versionize
+
+2003-07-02 Wed 23:14:15 +0000 kohler <kohler>
+Commit 1941c42223051a6977cf3374a2b195f7e5ad4c3d
+
+ * otftotfm/: otftotfm.1, otftotfm.cc: remove virtual font from
+ psfonts.map, and add --letterspacing option
+
+2003-07-02 Wed 23:13:53 +0000 kohler <kohler>
+Commit 9f0cc374efd4d7c61d6cab1fedb6d1c90ad1e450
+
+ * otftotfm/: gsubencoding.cc, gsubencoding.hh: chained positionings
+ support letterspacing
+
+2003-07-02 Wed 23:13:21 +0000 kohler <kohler>
+Commit bc994588a422c9d089f59bd2fbd5e7f9fda0b425
+
+ * otftotfm/automatic.cc: support removing a font from the
+ psfonts.map (useful for virtual fonts)
+
+2003-06-30 Mon 00:48:14 +0000 kohler <kohler>
+Commit 03969d0e7c256da1e6e6d90aff6b64179016caed
+
+ * NEWS, configure.in, otftotfm/automatic.cc,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh,
+ otftotfm/otftotfm.cc: hypothetically support left context
+
+2003-06-27 Fri 16:54:54 +0000 kohler <kohler>
+Commit 38c64214fb13b87e18d42f3f10c3735d81b012e5
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: versionize
+
+2003-06-27 Fri 16:38:38 +0000 kohler <kohler>
+Commit 4f51f561a3c2afcec039969a74672bb9b17100d0
+
+ * otftotfm/automatic.cc: error buglets reported by Bruce DArcus:
+ dont search for a writable texdir more than once; vendor is never
+ null string; error messages are a bit more verbose
+
+2003-06-26 Thu 21:53:08 +0000 kohler <kohler>
+Commit dad1363edd085e9361b280144ca10522a1d7ac72
+
+ * otftotfm/otftotfm.1: more manual nits
+
+2003-06-26 Thu 21:51:18 +0000 kohler <kohler>
+Commit e13e6f872a3206d12e47bdb34ca59a398cc71b13
+
+ * otftotfm/otftotfm.1: more manual nits
+
+2003-06-26 Thu 21:39:02 +0000 kohler <kohler>
+Commit 6116aa916e2a49d90d8ff647a1f02a1d638906e4
+
+ * 7t.enc, Makefile.am, otftotfm/dvipsencoding.cc,
+ otftotfm/gsubencoding.cc, otftotfm/otftotfm.1: diagnostics work
+
+2003-06-26 Thu 19:56:23 +0000 kohler <kohler>
+Commit 8d1aeb48ec6a4700aa388ca30df30cdacc10b812
+
+ * otftotfm/otftotfm.1: nit
+
+2003-06-26 Thu 19:54:15 +0000 kohler <kohler>
+Commit f7342186f529a1c7575e9c41acf06b1fc5c96694
+
+ * otftotfm/otftotfm.1: more links in feature section
+
+2003-06-26 Thu 19:50:49 +0000 kohler <kohler>
+Commit d5cad9e3d82627ce753dab58cb824debb669186d
+
+ * otftotfm/otftotfm.1: spello
+
+2003-06-26 Thu 19:47:00 +0000 kohler <kohler>
+Commit 554dd034831b0245f1fbed62784ae40565ff65e0
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: to release 0.11
+
+2003-06-26 Thu 19:30:06 +0000 kohler <kohler>
+Commit 0b0925f1ade5598ad455fb34473776f6ee4b0357
+
+ * otftotfm/: gsubencoding.cc, gsubencoding.hh, otftotfm.1,
+ otftotfm.cc: support -ffina
+
+2003-06-26 Thu 19:14:14 +0000 kohler <kohler>
+Commit 2006f820a852ed39466957215385447d547349b9
+
+ * otftotfm/: automatic.cc, dvipsencoding.cc, gsubencoding.cc,
+ gsubencoding.hh, otftotfm.1, otftotfm.cc: support right-context
+ single substitution (-fcswh)
+
+2003-06-26 Thu 08:20:37 +0000 kohler <kohler>
+Commit c08028e8d4932517346e198ab742f0ee8f79bee2
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in: note buglet:
+ update -ls-R for encodings
+
+2003-06-26 Thu 08:20:16 +0000 kohler <kohler>
+Commit 5c977b10469f3934192a8f599a786cae8d1a1a13
+
+ * otftotfm/: otftotfm.1, otftotfm.cc: update manual, and update
+ ls-R for new encodings
+
+2003-06-25 Wed 23:56:30 +0000 kohler <kohler>
+Commit 8e320832b31dea460c3e6851aae11144fb1d80c9
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: prepare for 0.9 distribution
+
+2003-06-25 Wed 06:01:35 +0000 kohler <kohler>
+Commit 4c2139959daffb8892332fbb9cec8dac3911442b
+
+ * otftotfm/: automatic.cc, otftotfm.cc, util.cc, util.hh: always
+ remove directory components from names in the mapfile; requested by
+ Norbert
+
+2003-06-24 Tue 22:28:48 +0000 kohler <kohler>
+Commit 420b558079600f35932d654fbfbec112358accd2
+
+ * COPYING, README, cfftot1/cfftot1.cc, cfftot1/maket1font.cc,
+ otftotfm/automatic.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/gsubencoding.cc, otftotfm/kpseinterface.c,
+ otftotfm/otftotfm.cc, otftotfm/util.cc, t1lint/cscheck.cc,
+ t1lint/t1lint.cc, t1testpage/t1testpage.cc: add explicit GPL to
+ files
+
+2003-06-24 Tue 21:00:46 +0000 kohler <kohler>
+Commit af3206425830483a8e7ac1eb0ed084a02e6bf321
+
+ * otftotfm/otftotfm.cc: nit
+
+2003-06-24 Tue 19:30:43 +0000 kohler <kohler>
+Commit 5a770d3650609be80cd95432d37d89d0d6c33a6a
+
+ * configure.in, otftotfm/Makefile.am: fix configury problems
+ reported by Norbert Preining and Bruce D'Arcus
+
+2003-06-24 Tue 19:30:13 +0000 kohler <kohler>
+Commit 72372f1ab6c40a4c94eec9f1ae28b551d3c16bda
+
+ * otftotfm/kpseinterface.c: #include <kpathsea/config.h> to get
+ necessary symbols
+
+2003-06-24 Tue 02:44:29 +0000 kohler <kohler>
+Commit b00ae74b577a800af5459d10d90a3381a18df1e4
+
+ * otftotfm/: automatic.cc, otftotfm.cc: more error messages
+ (missing encoding is a fatal error; warn on no writable $TEXMF),
+ and do not create ls-R
+
+2003-06-24 Tue 01:41:37 +0000 kohler <kohler>
+Commit 0f96933653a0c2d1d3294d2419f4ce0ccf13c20b
+
+ * otftotfm/otftotfm.1: whoops, manpagelet
+
+2003-06-24 Tue 01:35:10 +0000 kohler <kohler>
+Commit 119f0b291a580df9372d30b3765b9891c61deef8
+
+ * NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftotfm/otftotfm.1: update version to 0.8
+
+2003-06-24 Tue 01:13:49 +0000 kohler <kohler>
+Commit d00d394b775db087bee50b472cccaa8cb97ad419
+
+ * NEWS, otftotfm/otftotfm.1: more manual nits
+
+2003-06-24 Tue 00:47:54 +0000 kohler <kohler>
+Commit dce89c7d5c5e6174abf2a9f22015282b3ac1817b
+
+ * otftotfm/: automatic.cc, automatic.hh, otftotfm.1, otftotfm.cc:
+ manual fixes
+
+2003-06-23 Mon 21:15:37 +0000 kohler <kohler>
+Commit 11ab61c94f95363ebcc64cd508da17a3ad1e2025
+
+ * otftopl/.cvsignore: remove
+
+2003-06-23 Mon 21:15:09 +0000 kohler <kohler>
+Commit 12fd6bc61d6aa22da40353385af734973070ae13
+
+ * Makefile.am, configure.in, otftopl/Makefile.am,
+ otftopl/automatic.cc, otftopl/automatic.hh,
+ otftopl/dvipsencoding.cc, otftopl/dvipsencoding.hh,
+ otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/kpseinterface.c, otftopl/kpseinterface.h, otftopl/md5.c,
+ otftopl/md5.h, otftopl/otftopl.1, otftopl/otftopl.cc,
+ otftopl/util.cc, otftopl/util.hh, otftotfm/Makefile.am: remove old
+ directory
+
+2003-06-23 Mon 09:20:29 +0000 kohler <kohler>
+Commit 571dc455227f2dca5ad0aa61db136d568456fab5
+
+ * configure.in, otftopl/Makefile.am, otftopl/automatic.cc,
+ otftopl/automatic.hh, otftopl/kpseinterface.c,
+ otftopl/kpseinterface.h, otftopl/otftopl.cc, otftopl/util.cc,
+ otftopl/util.hh, otftotfm/Makefile.am, otftotfm/automatic.cc,
+ otftotfm/automatic.hh, otftotfm/kpseinterface.c,
+ otftotfm/kpseinterface.h, otftotfm/otftotfm.cc, otftotfm/util.cc,
+ otftotfm/util.hh: use C kpathsearch interface, for speed; add
+ --no-create and --verbose options; some nits in how -a files are
+ named
+
+2003-06-21 Sat 02:51:44 +0000 kohler <kohler>
+Commit f8b978c2502acd3b2884b64d10223d64fa811f23
+
+ * otftopl/automatic.cc, otftopl/gsubencoding.cc,
+ otftopl/gsubencoding.hh, otftotfm/automatic.cc,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh: default vendor
+ is "lcdftools", not "otftotfm"; make everything faster (profiling
+ identified GsubEncoding::encoding() as a bottleneck)
+
+2003-06-20 Fri 22:40:13 +0000 kohler <kohler>
+Commit 4bcbadb2219f14ffe4127ccd0df4273ef9f83b72
+
+ * otftopl/automatic.cc, otftopl/automatic.hh, otftopl/otftopl.cc,
+ otftopl/util.cc, otftopl/util.hh, otftotfm/automatic.cc,
+ otftotfm/automatic.hh, otftotfm/otftotfm.cc, otftotfm/util.cc,
+ otftotfm/util.hh: add support for --vendor, and search for
+ encodings with kpathsea
+
+2003-06-20 Fri 06:25:53 +0000 kohler <kohler>
+Commit 11584b635761b418a231a5d6b31c33ce424a608f
+
+ * acconfig.h, configure.in, otftopl/.cvsignore,
+ otftopl/Makefile.am, otftopl/automatic.cc, otftopl/automatic.hh,
+ otftopl/otftopl.1, otftopl/otftopl.cc, otftopl/util.cc,
+ otftopl/util.hh, otftotfm/.cvsignore, otftotfm/Makefile.am,
+ otftotfm/automatic.cc, otftotfm/automatic.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/util.cc, otftotfm/util.hh: otftopl
+ --automatic works with web2c
+
+2003-06-19 Thu 03:10:31 +0000 kohler <kohler>
+Commit 315712827c98ea03f97297d5b445fd67ce163026
+
+ * otftopl/dvipsencoding.cc, otftopl/dvipsencoding.hh,
+ otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/otftopl.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.cc: otftopl: moving
+ towards new, more automatic story, and support -f cpsp-like glyph
+ positionings
+
+2003-06-17 Tue 04:15:59 +0000 kohler <kohler>
+Commit a78e4e815e51e17192d89687c11e061cfc53b413
+
+ * otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/otftopl.cc, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.cc: warn when a feature
+ cannot be represented
+
+2003-06-13 Fri 23:10:08 +0000 kohler <kohler>
+Commit d317efb306b8c268ae841e3a863bc829ddb1bc8b
+
+ * Makefile.am, cfftot1/cfftot1.1, otftopl/otftopl.1,
+ otftotfm/otftotfm.1: fix make versionize
+
+2003-06-13 Fri 23:09:04 +0000 kohler <kohler>
+Commit b926cd3449914fa8c669aaf3eb0cd18338b8b91b
+
+ * NEWS, README, configure.in: to version 0.7
+
+2003-06-13 Fri 23:08:57 +0000 kohler <kohler>
+Commit 0a8078202f86c236dff90770437bc9c6f3819af0
+
+ * cfftot1/maket1font.cc: fix crash on MinionPro-It: remember that a
+ glyph can call a subroutine multiple times
+
+2003-06-13 Fri 23:08:39 +0000 kohler <kohler>
+Commit cf79044337fdb47b759b9e664d170da7fa0a521e
+
+ * otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/otftopl.cc, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.cc: include better
+ error messages when shrinking an encoding (was in 0.6, but not
+ checked in)
+
+2003-06-12 Thu 17:18:41 +0000 kohler <kohler>
+Commit 6662209e77e2a0e7fb17727a5a71fa511d7e6c66
+
+ * NEWS, README, configure.in, otftopl/dvipsencoding.cc,
+ otftopl/dvipsencoding.hh, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh: better warnings in dvipsencoding
+
+2003-06-12 Thu 05:24:57 +0000 kohler <kohler>
+Commit e527cff885bd31901f69361016f1e33587dbbc54
+
+ * otftopl/dvipsencoding.cc, otftotfm/dvipsencoding.cc: exit from
+ DvipsEncoding::parse() if you can't read the file
+
+2003-06-12 Thu 05:24:23 +0000 kohler <kohler>
+Commit 7e00a6be3e9eadb9e7f7bd4a2318b86a7d0e740f
+
+ * t1lint/t1lint.cc: process stdin if no filename supplied
+
+2003-06-12 Thu 05:24:01 +0000 kohler <kohler>
+Commit 11149aeb799081ec25d870aca4358f4ee358e3fe
+
+ * otftopl/otftopl.1, otftopl/otftopl.cc, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: replace --print-scripts with --query-scripts,
+ add --qs and --qf, and use new GsubLookup::unparse_automatics()
+ interface
+
+2003-06-12 Thu 05:23:10 +0000 kohler <kohler>
+Commit 77301fe293a059563c84fa3013f4c5b72ce32b01
+
+ * cfftot1/maket1font.cc: remove "good flex" noise, and make "bad
+ flex" more informative; report errors to an ErrorHandler; fix bad
+ definitions for Subrs 1 and 2
+
+2003-06-12 Thu 05:23:10 +0000 kohler <kohler>
+Commit 526f22ee6b9772ef11e86d63248362d0c596e401
+
+ * cfftot1/: cfftot1.cc, maket1font.hh: remove "good flex" noise,
+ and make "bad flex" more informative; report errors to an
+ ErrorHandler
+
+2003-06-06 Fri 02:22:23 +0000 kohler <kohler>
+Commit ad8d493a28f25385d44127befc539fc7294e5815
+
+ * mmafm/main.cc, mmpfb/main.cc: support -v as a synonym for
+ --version
+
+2003-06-06 Fri 02:19:47 +0000 kohler <kohler>
+Commit 5336c28e5f6cb6db34b553e7e5379439b97a7483
+
+ * NEWS, README, cfftot1/Makefile.am, cfftot1/cfftot1.1,
+ cfftot1/cfftot1.cc, cfftot1/templatei.cc, configure.in,
+ otftopl/Makefile.am, otftopl/otftopl.1, otftopl/otftopl.cc,
+ otftopl/templatei.cc, otftotfm/Makefile.am, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc, otftotfm/templatei.cc, t1lint/Makefile.am,
+ t1lint/templatei.cc, t1testpage/Makefile.am,
+ t1testpage/templatei.cc: template reorganization for gcc-3.3
+
+2003-06-06 Fri 02:14:35 +0000 kohler <kohler>
+Commit 7d7b9086c1fb287d54b00f6928713f9d727822a9
+
+ * mmafm/Makefile.am, mmafm/mmafm.1, mmafm/templatei.cc,
+ mmpfb/Makefile.am, mmpfb/mmpfb.1, mmpfb/myfont.cc,
+ mmpfb/templatei.cc: more template nonsense
+
+2003-06-04 Wed 01:48:56 +0000 kohler <kohler>
+Commit 00e7439e96e30b49c3692a3cf94ed2344a00c7f9
+
+ * otftopl/otftopl.cc, otftotfm/otftotfm.cc: oops: calculate shear
+ correctly
+
+2003-06-04 Wed 01:41:48 +0000 kohler <kohler>
+Commit c7258380427dbb33cdfb30d7faa2cc748e9f6190
+
+ * NEWS, README, configure.in, otftopl/otftopl.1,
+ otftopl/otftopl.cc, otftotfm/otftotfm.1, otftotfm/otftotfm.cc: to
+ 0.4: add --extend and --slant
+
+2003-06-04 Wed 00:22:12 +0000 kohler <kohler>
+Commit f7540c6415a91f4968548a43122c6658d14a0930
+
+ * otftopl/otftopl.cc, otftotfm/otftotfm.cc: shift the command line
+ to after the encoding to attempt to please ps2pk (it failed, ps2pk
+ is so lame, but it was a start)
+
+2003-06-03 Tue 23:45:28 +0000 kohler <kohler>
+Commit 6a5f1a0b5ae61c7bcd0191d2a900ad4e18cf596a
+
+ * otftopl/otftopl.cc, otftotfm/otftotfm.cc: change AutoEnc_digest
+ to AutoEnc-digest to satisfy ps2pk
+
+2003-06-03 Tue 20:01:19 +0000 kohler <kohler>
+Commit 70f4834c314c0037996307241b025ce9f6b02b83
+
+ * Makefile.am, NEWS, README, cfftot1/cfftot1.1, configure.in,
+ otftopl/otftopl.1, otftotfm/otftotfm.1: new version
+
+2003-06-03 Tue 20:01:05 +0000 kohler <kohler>
+Commit 4d2c2431b26629c79d41601106567809ac989392
+
+ * t1testpage/t1testpage.cc: nit
+
+2003-06-03 Tue 20:00:56 +0000 kohler <kohler>
+Commit 52119f082a259e09665aa0d43b969fe9200f5a12
+
+ * cfftot1/maket1font.cc: don't include FontInfo dict if theres no
+ FontInfo, and account for the extra elements of the Private dict
+ with add_dict_size()
+
+2003-06-03 Tue 19:56:31 +0000 kohler <kohler>
+Commit a266b3ca0bb102eddd791e6a42becd4a5a15cd96
+
+ * mmpfb/: main.cc, myfont.cc, t1rewrit.cc: quit early on invalid
+ font, and adapt to libefont changes
+
+2003-06-03 Tue 19:56:03 +0000 kohler <kohler>
+Commit 1ba38aaf8e67aa524cfdc620d4ea097c6f5a025f
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: use .M for manpage links
+
+2003-06-03 Tue 16:16:18 +0000 kohler <kohler>
+Commit e6e0b60993091d82ec99304d2016e2a3ab42f50b
+
+ * NEWS, cfftot1/cfftot1.1, configure.in, otftopl/otftopl.1,
+ otftotfm/otftotfm.1: update to version 0.2: fix Vladimir Volovich's
+ bugs
+
+2003-06-03 Tue 16:16:18 +0000 kohler <kohler>
+Commit 109c912cf633251008496704d536d20790230039
+
+ * cfftot1/cfftot1.cc: MS/DOS _setmode() to binary when appropriate;
+ and bag when the CFF contains errors (VVV)
+
+2003-06-03 Tue 16:16:18 +0000 kohler <kohler>
+Commit d559c7cb131933279e3358e9af40372c8cf1b1d1
+
+ * otftopl/util.cc, otftotfm/util.cc: MS/DOS _setmode() to binary
+ when appropriate
+
+2003-06-03 Tue 15:15:46 +0000 kohler <kohler>
+Commit b6e873c06cfbb476fa983d5ec4170b2f217cb5d8
+
+ * configure.in: ntoh[sl] configury
+
+2003-06-03 Tue 05:22:33 +0000 kohler <kohler>
+Commit 1f72c5bf21fbbfc09168d7813822b66ba4bfc24f
+
+ * otftopl/dvipsencoding.cc, otftopl/dvipsencoding.hh,
+ otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/otftopl.1, otftopl/otftopl.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: support {L} {K} {LK} {KL} LIGKERN commands;
+ document them; and don't output duplicate kerns
+
+2003-06-03 Tue 04:22:15 +0000 kohler <kohler>
+Commit dda9921ebd1869bfa8625ceb19d96bda77061491
+
+ * README, cfftot1/Makefile.am, cfftot1/cfftot1.1,
+ otftopl/Makefile.am, otftopl/otftopl.1, otftotfm/Makefile.am,
+ otftotfm/otftotfm.1: include manual pages in distribution; manual
+ pages contain links as .M; fix README
+
+2003-06-03 Tue 01:00:04 +0000 kohler <kohler>
+Commit 516d2a2774b474e533e69f1147aff1e7aa822ba7
+
+ * cfftot1/Makefile.am: duh
+
+2003-06-03 Tue 00:53:14 +0000 kohler <kohler>
+Commit 7a845fae7e9851a3199ef0f128fbfc0727843572
+
+ * Makefile.am, cfftot1/cfftot1.1, configure.in,
+ otftopl/dvipsencoding.cc, otftopl/otftopl.1, otftopl/otftopl.cc,
+ otftotfm/dvipsencoding.cc, otftotfm/otftotfm.1,
+ otftotfm/otftotfm.cc: nits and behavior changesw
+
+2003-06-01 Sun 18:45:00 +0000 kohler <kohler>
+Commit 9720fb965f383afd0dabc8899c2c26eec7b9a38d
+
+ * cfftot1/Makefile.am, configure.in, otftopl/Makefile.am,
+ otftopl/otftopl.1, otftopl/otftopl.cc, otftopl/util.hh,
+ otftotfm/Makefile.am, otftotfm/otftotfm.1, otftotfm/otftotfm.cc,
+ otftotfm/util.hh: add --tfm option
+
+2003-06-01 Sun 16:20:50 +0000 kohler <kohler>
+Commit b2accf3c9951da52ff61a0a57fda69f9b48fddba
+
+ * mmpfb/main.cc: adapt to ErrorHandler changes
+
+2003-06-01 Sun 16:18:28 +0000 kohler <kohler>
+Commit 422f62a30b971ace95d652eeb34a9bece156d1bf
+
+ * mmafm/main.cc, mmpfb/main.cc: adapt to ErrorHandler changes
+
+2003-06-01 Sun 06:29:43 +0000 kohler <kohler>
+Commit 66ae2fb97b4b8248e5e357086e8f0e716231eec2
+
+ * Makefile.am, NEWS, cfftot1/Makefile.am, cfftot1/cfftot1.1,
+ cfftot1/cfftot1.cc, otftopl/Makefile.am, otftopl/otftopl.1,
+ otftotfm/Makefile.am, otftotfm/otftotfm.1, t1lint/Makefile.am:
+ manual pages
+
+2003-06-01 Sun 00:35:28 +0000 kohler <kohler>
+Commit 105dcc2da62b16f3b82d3602c182fc2c8cf7c8c5
+
+ * otftopl/otftopl.cc, otftotfm/otftotfm.cc: support
+ --print-features, --print-scripts, etc
+
+2003-06-01 Sun 00:29:08 +0000 kohler <kohler>
+Commit 56308ec88197af8b9a71724ed0e8b63902be1aed
+
+ * cfftot1/cfftot1.cc, configure.in, otftopl/otftopl.cc,
+ otftopl/util.cc, otftotfm/otftotfm.cc, otftotfm/util.cc,
+ t1lint/t1lint.cc, t1testpage/t1testpage.cc: support
+ --print-features, --print-scripts, etc
+
+2003-05-31 Sat 00:24:33 +0000 kohler <kohler>
+Commit 751b0fc7cd4d1c852cbe390a838d1ba35d93e1ed
+
+ * Makefile.am, cfftot1/maket1font.cc, configure.in,
+ otftopl/.cvsignore, otftopl/Makefile.am, otftopl/otftopl.cc,
+ otftotfm/.cvsignore, otftotfm/Makefile.am, otftotfm/otftotfm.cc:
+ rename to otftopl; cfftot1 adapts to Type1Interp changes
+
+2003-05-30 Fri 23:22:18 +0000 kohler <kohler>
+Commit 42e8788904d0c681548a8c370b9d04e128dda733
+
+ * cfftot1/cfftot1.cc, t1lint/t1lint.cc, t1testpage/t1testpage.cc:
+ ErrorHandler adaptation continued
+
+2003-05-30 Fri 23:21:48 +0000 kohler <kohler>
+Commit 6cb8b6d38ca3a75b4b6f9140fd855002cec6a7cf
+
+ * otftopl/Makefile.am, otftopl/dvipsencoding.cc,
+ otftopl/dvipsencoding.hh, otftopl/gsubencoding.cc,
+ otftopl/gsubencoding.hh, otftopl/md5.c, otftopl/md5.h,
+ otftopl/otftopl.cc, otftotfm/Makefile.am,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh, otftotfm/md5.c,
+ otftotfm/md5.h, otftotfm/otftotfm.cc: creeping toward usability
+
+2003-05-30 Fri 06:24:53 +0000 kohler <kohler>
+Commit 41d7d98f84f3e4ca3468ad0fc19de199dcdbdde9
+
+ * cfftot1/cfftot1.cc, otftopl/dvipsencoding.cc,
+ otftopl/dvipsencoding.hh, otftopl/gsubencoding.cc,
+ otftopl/gsubencoding.hh, otftopl/otftopl.cc, otftopl/util.cc,
+ otftotfm/dvipsencoding.cc, otftotfm/dvipsencoding.hh,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh,
+ otftotfm/otftotfm.cc, otftotfm/util.cc, t1lint/t1lint.cc,
+ t1testpage/t1testpage.cc: adapt to ErrorHandler changes, and apply
+ LIGKERN statements to the output
+
+2003-05-29 Thu 22:23:55 +0000 kohler <kohler>
+Commit 88398a984891146ce869b52a60ee02740893efaf
+
+ * cfftot1/cfftot1.cc, cfftot1/maket1font.cc, cfftot1/maket1font.hh,
+ otftopl/dvipsencoding.cc, otftopl/dvipsencoding.hh,
+ otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/otftopl.cc, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.cc: adapt, and move
+ towards a correct otftoafm
+
+2003-05-29 Thu 06:03:43 +0000 kohler <kohler>
+Commit 43b311012aac653bcc290c942a6b667488f02dd0
+
+ * libefont/Makefile.am, otftopl/gsubencoding.cc,
+ otftopl/gsubencoding.hh, otftopl/otftopl.cc,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh,
+ otftotfm/otftotfm.cc: parse GPOS
+
+2003-05-28 Wed 06:28:58 +0000 kohler <kohler>
+Commit 48e197c7cb3ef5985fa41c8992e6a5feb31f8396
+
+ * Makefile.am, acconfig.h, configure.in, glyphlist.txt,
+ otftopl/Makefile.am, otftopl/dvipsencoding.cc,
+ otftopl/dvipsencoding.hh, otftopl/gsubencoding.cc,
+ otftopl/gsubencoding.hh, otftopl/otftopl.cc, otftopl/util.cc,
+ otftopl/util.hh, otftotfm/Makefile.am, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/gsubencoding.cc,
+ otftotfm/gsubencoding.hh, otftotfm/otftotfm.cc, otftotfm/util.cc,
+ otftotfm/util.hh: generate simple VPLs
+
+2003-05-26 Mon 01:09:06 +0000 kohler <kohler>
+Commit ace747169788cfdba5a505403d9b80a61fe8f7ae
+
+ * otftopl/Makefile.am, otftopl/dvipsencoding.cc,
+ otftopl/dvipsencoding.hh, otftopl/templatei.cc,
+ otftotfm/Makefile.am, otftotfm/dvipsencoding.cc,
+ otftotfm/dvipsencoding.hh, otftotfm/templatei.cc: moving towards
+ DVIPS encoding parsing
+
+2003-05-25 Sun 09:18:05 +0000 kohler <kohler>
+Commit 72a3c17c0c5ee13b4e5d3ee25b98f7575f0c815e
+
+ * cfftot1/cfftot1.cc, libefont/Makefile.am, otftopl/Makefile.am,
+ otftopl/gsubencoding.cc, otftopl/gsubencoding.hh,
+ otftopl/otftopl.cc, otftopl/templatei.cc, otftotfm/Makefile.am,
+ otftotfm/gsubencoding.cc, otftotfm/gsubencoding.hh,
+ otftotfm/otftotfm.cc, otftotfm/templatei.cc: first version with
+ GSUB support
+
+2003-05-23 Fri 19:52:38 +0000 kohler <kohler>
+Commit e9d9015646f9ddc73e7ffd9e62b4431158db66a0
+
+ * libefont/Makefile.am: otfdescrip
+
+2003-05-23 Fri 02:06:20 +0000 kohler <kohler>
+Commit acdbcfaab5ad3a05b97e1aa0876c3977597cec9f
+
+ * libefont/Makefile.am, otftopl/otftopl.cc, otftotfm/otftotfm.cc:
+ use new GSUB format
+
+2003-02-11 Tue 00:34:38 +0000 kohler <kohler>
+Commit dc313dddd7bffeed10d1e1e48dd5d732a267bc8a
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: mminstance.spec, not rpm.spec; and
+ check that "make versionize" has been done
+
+2003-01-27 Mon 18:45:20 +0000 kohler <kohler>
+Commit b15fb5815d6289c2a97f0cdf18551d69e9a9b48d
+
+ * acconfig.h, cfftot1/maket1font.cc, t1lint/cscheck.cc: nit
+
+2003-01-05 Sun 22:36:08 +0000 kohler <kohler>
+Commit d476a8cabcf61a16e829d369240eef85a58343ee
+
+ * mmpfb/main.cc: add --help entry for --minimize
+
+2003-01-05 Sun 22:25:15 +0000 kohler <kohler>
+Commit 8af66abc90ea39949d8f43fd0e98c78157a333db
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/mmpfb.1: nitlets
+
+2003-01-05 Sun 22:24:34 +0000 kohler <kohler>
+Commit 0b76803a3d2e4e7fcb51a6054a3906cbdb85f66c
+
+ * mmafm/templatei.cc: remove useless instantiation
+
+2003-01-05 Sun 22:24:18 +0000 kohler <kohler>
+Commit 5dc01f4936c7e32b659f32420e36b7a95fc19c32
+
+ * mmpfb/: t1rewrit.cc, t1rewrit.hh: add subroutine renumbering
+
+2003-01-05 Sun 22:23:44 +0000 kohler <kohler>
+Commit d6e67cf387ecdd4ca726fa52b2e7beaf57634ad6
+
+ * mmpfb/: myfont.cc, myfont.hh: interpolate FullName as well as
+ FontName; uncache FontName definition after interpolation
+
+2003-01-05 Sun 22:23:16 +0000 kohler <kohler>
+Commit 77666ed824df7f7372539d1454ad9d309e40ef12
+
+ * mmpfb/: Makefile.am, main.cc, t1minimize.cc, t1minimize.hh: add
+ --minimize option; also, fill in Subrs array
+
+2003-01-05 Sun 17:30:21 +0000 kohler <kohler>
+Commit 728da4bb93746df7c1d93975809db69b7311668f
+
+ * mmafm/Makefile.am, mmafm/hashmapi.cc, mmafm/mmafm.1,
+ mmafm/templatei.cc, mmafm/vectori.cc, mmpfb/Makefile.am,
+ mmpfb/hashmapi.cc, mmpfb/mmpfb.1, mmpfb/templatei.cc,
+ mmpfb/vectori.cc: mminstance compiles again
+
+2003-01-02 Thu 20:12:56 +0000 kohler <kohler>
+Commit f1aa2c7fb74b54bdc12e5818e31638ffa89d3bc0
+
+ * cfftot1/cfftot1.cc, libefont/Makefile.am, otftopl/otftopl.cc,
+ otftopl/templatei.cc, otftotfm/otftotfm.cc, otftotfm/templatei.cc:
+ adapt to changes
+
+2002-12-31 Tue 23:20:57 +0000 kohler <kohler>
+Commit 3ed98f59cefe7c43703802eb56fff2b82e2c389b
+
+ * otftopl/otftopl.cc, otftotfm/otftotfm.cc: nitlet
+
+2002-12-31 Tue 21:48:48 +0000 kohler <kohler>
+Commit 12c038b8cd59b2972814909e3bbb92ae6ceeab08
+
+ * Makefile.am, cfftot1/cfftot1.cc, configure.in,
+ libefont/Makefile.am, liblcdf/Makefile.am, otftopl/.cvsignore,
+ otftopl/Makefile.am, otftopl/otftopl.cc, otftopl/templatei.cc,
+ otftotfm/.cvsignore, otftotfm/Makefile.am, otftotfm/otftotfm.cc,
+ otftotfm/templatei.cc: updates, and add otftoafm
+
+2002-12-30 Mon 23:38:41 +0000 kohler <kohler>
+Commit 283455867a4e005f5ebffe5b14ab11e4e4aa2ebc
+
+ * cfftot1/Makefile.am, cfftot1/maket1font.cc, cfftot1/point.cc,
+ cfftot1/point.hh, cfftot1/transform.cc, cfftot1/transform.hh,
+ liblcdf/Makefile.am, t1lint/Makefile.am, t1lint/cscheck.cc,
+ t1lint/cscheck.hh, t1lint/point.cc, t1lint/point.hh: Point moved to
+ liblcdf
+
+2002-12-30 Mon 21:36:30 +0000 kohler <kohler>
+Commit e987b6f3c924ded46cdeaf267403ac89edc6686e
+
+ * .cvsignore: nitlet
+
+2002-12-30 Mon 21:33:23 +0000 kohler <kohler>
+Commit 9d32e8c0bd6b99289ca68150d6f347d36ba934b8
+
+ * .cvsignore, Makefile.am, cfftot1/Makefile.am, cfftot1/cfftot1.cc,
+ cfftot1/maket1font.cc, cfftot1/maket1font.hh, cfftot1/templatei.cc,
+ configure.in, edlib/.cvsignore, edlib/Makefile.am,
+ libefont/Makefile.am, liblcdf/.cvsignore, liblcdf/Makefile.am,
+ t1lint/Makefile.am, t1lint/cscheck.cc, t1lint/cscheck.hh,
+ t1lint/t1lint.cc, t1lint/templatei.cc, t1testpage/Makefile.am,
+ t1testpage/t1testpage.cc, t1testpage/templatei.cc: adapt to new
+ source file organization
+
+2002-12-30 Mon 18:14:53 +0000 kohler <kohler>
+Commit 8def2fe6234a1d63649e8e2e4f9c638088f11d89
+
+ * mmafm/Makefile.am, mmpfb/Makefile.am: further adaptation
+
+2002-12-30 Mon 18:06:17 +0000 kohler <kohler>
+Commit 816ec0f3b489befa2bed0e85baa5a8ace88c167d
+
+ * mmafm/Makefile.am, mmafm/hashmapi.cc, mmafm/main.cc,
+ mmafm/vectori.cc, mmpfb/Makefile.am, mmpfb/hashmapi.cc,
+ mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/t1rewrit.cc,
+ mmpfb/t1rewrit.hh, mmpfb/vectori.cc: adapt to libefont and liblcdf
+ rearrangement
+
+2002-12-30 Mon 06:16:07 +0000 kohler <kohler>
+Commit a55f9e25cf370df8b9459cadbc0ed0d956bb1803
+
+ * mmafm/Makefile.am, mmafm/main.cc, mmafm/vectori.cc,
+ mmpfb/Makefile.am, mmpfb/hashmapi.cc, mmpfb/main.cc,
+ mmpfb/myfont.cc, mmpfb/myfont.hh, mmpfb/t1rewrit.cc,
+ mmpfb/t1rewrit.hh: adapt to libefont reorganization
+
+2002-12-12 Thu 08:30:48 +0000 kohler <kohler>
+Commit 254562b21e0d24152cbc7f593fbad24616d49348
+
+ * cfftot1/: cfftot1.cc, maket1font.cc: cfftot1 produces Subrs
+
+2002-12-11 Wed 00:00:17 +0000 kohler <kohler>
+Commit bf478cf8d6e7e174dd7b189f92906f082108eecb
+
+ * configure.in: configury fix
+
+2002-12-10 Tue 20:13:09 +0000 kohler <kohler>
+Commit 9d91a0a53a172be0b79091ed6cea4ab9b8a99588
+
+ * acconfig.h, configure.in: new configury for uintXX_t types et al
+
+2002-12-10 Tue 20:12:56 +0000 kohler <kohler>
+Commit 0d8e7222014a428bd096fddf6943dfe56b726234
+
+ * cfftot1/maket1font.cc: more updates
+
+2002-12-10 Tue 20:05:27 +0000 kohler <kohler>
+Commit 7fc3bbfa84d2a901f2da41e9ade2ccaad4fe1375
+
+ * t1lint/cscheck.cc: use CharstringInterp::error_string()
+
+2002-12-10 Tue 18:30:55 +0000 kohler <kohler>
+Commit 36e380f885fe48304ceef514b0b12a04174ba56d
+
+ * cfftot1/: maket1font.cc, templatei.cc: moving towards subr
+ adaptation
+
+2002-12-09 Mon 20:22:18 +0000 kohler <kohler>
+Commit 756350e4e6732377e3fa219e8350e93ccde5e384
+
+ * configure.in: add -W as well as -Wall
+
+2002-12-09 Mon 20:22:07 +0000 kohler <kohler>
+Commit f9cfdbe23189919a03ceff8d7bd39ae50c3cf0c3
+
+ * cfftot1/maket1font.cc: add Flex and hint replacement support
+
+2002-12-08 Sun 08:24:32 +0000 kohler <kohler>
+Commit 384c9f131837265e70f26d30d8174d9ed84f7f55
+
+ * cfftot1/Makefile.am, cfftot1/cfftot1.cc, cfftot1/maket1font.cc,
+ cfftot1/maket1font.hh, cfftot1/point.cc, cfftot1/point.hh,
+ cfftot1/transform.cc, cfftot1/transform.hh, t1lib/.cvsignore,
+ t1lib/Makefile.am, t1lint/point.hh: first working version of
+ cfftot1!
+
+2002-12-08 Sun 08:22:52 +0000 kohler <kohler>
+Commit 9c053442feddbb47b8e54b8d45e8c14c69e9c41a
+
+ * mmpfb/myfont.cc: adapt to libefont
+
+2002-12-07 Sat 08:27:21 +0000 kohler <kohler>
+Commit 1984eaac64d40159b0e2836e2b1349c4ba7a5c1a
+
+ * Makefile.am, acconfig.h, cfftot1/.cvsignore, cfftot1/Makefile.am,
+ cfftot1/cfftot1.cc, cfftot1/templatei.cc, configure.in,
+ edlib/.cvsignore, edlib/Makefile.am, libefont/.cvsignore,
+ libefont/Makefile.am, t1lint/.cvsignore, t1lint/Makefile.am,
+ t1lint/cscheck.cc, t1lint/cscheck.hh, t1lint/hashmapi.cc,
+ t1lint/t1lint.cc, t1lint/templatei.cc, t1lint/vectori.cc,
+ t1testpage/.cvsignore, t1testpage/Makefile.am,
+ t1testpage/hashmapi.cc, t1testpage/t1testpage.cc,
+ t1testpage/templatei.cc, t1testpage/vectori.cc: name cleanup,
+ templatei not vectori
+
+2002-12-07 Sat 08:16:22 +0000 kohler <kohler>
+Commit b74e853e102c534cde9abb9c108158096ca0a6d1
+
+ * mmpfb/: t1rewrit.cc, t1rewrit.hh: more name changes
+
+2002-12-07 Sat 01:32:10 +0000 kohler <kohler>
+Commit fe83ab32aefe35f2cec7f1e5331181452c737c81
+
+ * mmafm/.cvsignore, mmafm/Makefile.am, mmpfb/.cvsignore,
+ mmpfb/Makefile.am: move to libefont instead of separate t1lib and
+ metricslib
+
+2002-12-05 Thu 06:56:31 +0000 kohler <kohler>
+Commit b65de23b262c4c80969fc1b44ee6a97d13143470
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/myfont.hh,
+ mmpfb/t1rewrit.cc, mmpfb/t1rewrit.hh: fix bugs with regular Type 1
+ charstrings; keep track of, and compensate for, rounding error in
+ mmpfb
+
+2002-12-04 Wed 23:03:57 +0000 kohler <kohler>
+Commit 6fae920675401ba80a01c674017d6568dadec1e3
+
+ * mmafm/vectori.cc, mmpfb/t1rewrit.cc, mmpfb/vectori.cc: CFF works!
+
+2002-12-04 Wed 18:00:13 +0000 kohler <kohler>
+Commit fda125bdc99727a79fd233c514ea76b4021d6b39
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/myfont.hh,
+ mmpfb/t1rewrit.cc: more adaptations for Type 2 preparation,
+ renamings and indentation
+
+2002-12-03 Tue 23:22:42 +0000 kohler <kohler>
+Commit 867552c7667f1984ac75f05e200841608068190c
+
+ * mmpfb/: myfont.cc, t1rewrit.cc: conform to edlib update
+
+2002-12-03 Tue 21:53:21 +0000 kohler <kohler>
+Commit f16c36c6a708ce1018b258bd7969f5e789ceecd5
+
+ * mmpfb/t1rewrit.hh: adapt to t1lib changes
+
+2002-12-03 Tue 21:50:37 +0000 kohler <kohler>
+Commit ca24330a0a57cd1893f378abbea19292b338d329
+
+ * mmafm/Makefile.am, mmpfb/Makefile.am, mmpfb/main.cc,
+ mmpfb/t1rewrit.cc: moving towards supporting Type 2 fonts
+
+2002-10-05 Sat 18:04:03 +0000 kohler <kohler>
+Commit f4cb4630f31947106939a3beaf4a5c0453c4aeb2
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/myfont.hh,
+ mmpfb/t1rewrit.cc: use C++ names for C #includes
+
+2002-10-05 Sat 16:11:29 +0000 kohler <kohler>
+Commit a9081325b5147bdd8be18bfe981360cd7c6494a2
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: to 1.18
+
+2002-09-30 Mon 20:23:35 +0000 kohler <kohler>
+Commit 7c7873998ff55dc9ffefbab59bd849d180823876
+
+ * mmafm/mmafm.1, mmpfb/main.cc, mmpfb/mmpfb.1, mmpfb/myfont.cc: to
+ 1.17
+
+2001-09-18 Tue 01:23:02 +0000 kohler <kohler>
+Commit 608c05012399e19e2aa58df5eb178f303f1974d8
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: 1.16.3: mac os x
+
+2001-09-11 Tue 11:47:38 +0000 kohler <kohler>
+Commit 9e568871fd98747fe4d05d1d737af1e578b16ad0
+
+ * mmpfb/t1rewrit.cc: final math nitlet: want same result on
+ different platforms, despite use of floating point; this seems to
+ do the trick
+
+2001-09-11 Tue 11:45:42 +0000 kohler <kohler>
+Commit bb61c8d53388a75b48e8da19d49d8b0578083160
+
+ * mmpfb/t1rewrit.cc: more math crap
+
+2001-09-11 Tue 11:44:50 +0000 kohler <kohler>
+Commit 54236aa282fa7d9a2e076e8972e564da24991ea8
+
+ * mmpfb/t1rewrit.cc: more math crap
+
+2001-09-11 Tue 11:38:10 +0000 kohler <kohler>
+Commit f634d8775803418fb3d97c1fbba972a6ee813de0
+
+ * mmpfb/: t1rewrit.cc, t1rewrit.hh: more math crap
+
+2001-09-11 Tue 11:38:10 +0000 kohler <kohler>
+Commit 3bb51b001ae49740e6b60dcbf6f9e361a230d872
+
+ * mmpfb/t1rewrit.cc: more math crap
+
+2001-09-10 Mon 18:42:12 +0000 kohler <kohler>
+Commit 8e1e029cb1e3d361dae8685c5b60ae235cc8de68
+
+ * mmafm/main.cc: correct --help
+
+2001-09-06 Thu 18:30:03 +0000 kohler <kohler>
+Commit 8414e08ca02fef78adb82d16e1c6006444e84cd9
+
+ * mmafm/hashmapi.cc, mmafm/mmafm.1, mmafm/vectori.cc,
+ mmpfb/mmpfb.1, mmpfb/myfont.cc, mmpfb/t1rewrit.cc: compilation
+ fixes from Beebe
+
+2001-07-16 Mon 01:42:47 +0000 kohler <kohler>
+Commit 18d38874f84c0439c581e61453ebe7adf3b18772
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/main.cc, mmpfb/mmpfb.1,
+ mmpfb/t1rewrit.cc: to mminstance 1.16.1: playing with inlines
+
+2001-06-18 Mon 21:07:00 +0000 kohler <kohler>
+Commit b30268740b5ba0a26b8b8619e2c4a03a5afbcad4
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: to 1.16
+
+2000-11-04 Sat 18:51:57 +0000 eddietwo <eddietwo>
+Commit dc0d7325fdf86a0a34e04bae6fb64aa24368956e
+
+ * mmpfb/myfont.cc: changes to support gcc-2.96
+
+2000-07-12 Wed 18:39:12 +0000 eddietwo <eddietwo>
+Commit 450d311107971a18950cf72daad17924c24505f7
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1, mmpfb/t1rewrit.cc: 1.15
+
+2000-06-23 Fri 03:12:16 +0000 eddietwo <eddietwo>
+Commit 71bd547b944120221a48d2f5770a7f18d480db75
+
+ * mmpfb/: myfont.cc, myfont.hh: x
+
+2000-04-20 Thu 14:29:23 +0000 eddietwo <eddietwo>
+Commit bfd13d0954d5c1349d71fec9260eb51a35fb1cfb
+
+ * Makefile.am, configure.in, t1lint/Makefile.am, t1lint/main.cc,
+ t1lint/t1lint.cc, t1testpage/.cvsignore, t1testpage/Makefile.am,
+ t1testpage/hashmapi.cc, t1testpage/t1testpage.cc,
+ t1testpage/vectori.cc: added t1testpage
+
+2000-04-20 Thu 14:27:39 +0000 eddietwo <eddietwo>
+Commit 67193bd19d35875e17b7d7006fd1b88af6ef5ff5
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: versionize
+
+2000-04-20 Thu 14:26:31 +0000 eddietwo <eddietwo>
+Commit bc774ad1f64f8f4924760a446d867a96652a1167
+
+ * mmpfb/: main.cc, myfont.cc: to v1.13 (synthetic fonts)
+
+2000-04-06 Thu 21:50:36 +0000 eddietwo <eddietwo>
+Commit 3f472cd3844761baa2d420f133fca1a95e481526
+
+ * mmafm/Makefile.am, mmpfb/Makefile.am: CLEANFILES
+
+2000-04-05 Wed 15:45:41 +0000 eddietwo <eddietwo>
+Commit a211132b69650cb06c7053bae3ba9e1f38acc0a1
+
+ * mmafm/.cvsignore, mmafm/Makefile.am, mmafm/main.cc,
+ mmafm/mmafm.1, mmpfb/.cvsignore, mmpfb/Makefile.am, mmpfb/mmpfb.1,
+ mmpfb/myfont.cc, mmpfb/t1rewrit.cc, mmpfb/t1rewrit.hh: updates for
+ new straccum/edlib/metricslib; fixed mmpfb
+
+2000-04-05 Wed 15:40:55 +0000 eddietwo <eddietwo>
+Commit a29c3e1329b63d0bf8a08af660f311f5fdd498bc
+
+ * Makefile.am, configure.in, edlib/.cvsignore, edlib/Makefile.am,
+ t1lib/.cvsignore, t1lib/Makefile.am, t1lint/.cvsignore,
+ t1lint/Makefile.am, t1lint/cscheck.cc, t1lint/cscheck.hh: better
+ error messages in t1lint
+
+2000-04-03 Mon 15:01:19 +0000 eddietwo <eddietwo>
+Commit e3f26ba82d79fa6ccc9a99997440efe2e086a518
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/mmpfb.1: include
+
+2000-02-21 Mon 21:59:50 +0000 eddietwo <eddietwo>
+Commit 9f8c70a93a52c48cbe927461e44aa16bc9ecdb22
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1, mmpfb/myfont.cc: r1_10
+
+2000-01-18 Tue 16:00:51 +0000 eddietwo <eddietwo>
+Commit 8823d8903fe7956e5a72f8b3806ab96100019d85
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1, mmpfb/t1rewrit.cc: fixed UNKDOUBLE
+ bug and error buffer overrun
+
+2000-01-17 Mon 19:12:00 +0000 eddietwo <eddietwo>
+Commit ac795d64d24e5e6f8b49517ae0d18e89c9845605
+
+ * acconfig.h, configure.in, edlib/.cvsignore, t1lib/.cvsignore,
+ t1lint/.cvsignore, t1lint/main.cc: updates
+
+2000-01-11 Tue 04:03:04 +0000 eddietwo <eddietwo>
+Commit 5206557ed1208ecc3018f079ba3da40b9188c736
+
+ * mmpfb/: t1rewrit.cc, t1rewrit.hh: mminstance 1.8
+
+2000-01-10 Mon 16:39:13 +0000 eddietwo <eddietwo>
+Commit 174e8dad01757a06fd23a5a89b1c85eb9cb85ac2
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/main.cc, mmpfb/mmpfb.1,
+ mmpfb/myfont.cc: copyright changes, updated for thanh
+
+1999-12-30 Thu 21:59:50 +0000 eddietwo <eddietwo>
+Commit 17c49fb39fb07d841a7f6206d0556dcd34ee87a7
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: version 1.7
+
+1999-12-20 Mon 02:40:12 +0000 eddietwo <eddietwo>
+Commit 67649262f7e613742dbf57d7a9a73d5d16ebcc7f
+
+ * mmpfb/main.cc: error-related
+
+1999-11-28 Sun 23:12:35 +0000 eddietwo <eddietwo>
+Commit de57227d22e93d5eaeab2993687aee186a71f9f5
+
+ * mmafm/mmafm.1: %8g not %g; man page rearrange
+
+1999-11-28 Sun 22:48:50 +0000 eddietwo <eddietwo>
+Commit 0452e72bba125a425cbad9f68bc5917aae542709
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/mmpfb.1: to 1.6
+
+1999-07-05 Mon 00:12:28 +0000 eddietwo <eddietwo>
+Commit a29e18c1fc897763de1235775e45dac6af5c9fc5
+
+ * mmpfb/: main.cc, mmpfb.1, t1rewrit.cc: 1.5
+
+1999-07-04 Sun 22:01:35 +0000 eddietwo <eddietwo>
+Commit e00bbc7358c58b4e38ebd06fa21eb90a085c01f3
+
+ * mmpfb/myfont.cc: dont kill things you dont understand
+
+1999-07-04 Sun 21:57:12 +0000 eddietwo <eddietwo>
+Commit d6e0c8dec73c936cfacae30045890be367bb56a1
+
+ * mmpfb/myfont.cc: dont get rid of dictionaries inside Blend
+
+1999-07-04 Sun 21:55:05 +0000 eddietwo <eddietwo>
+Commit 86c1868a78e8b561e6ebe17ff742be01816053ca
+
+ * mmpfb/myfont.cc: dont get rid of dictionaries inside Blend
+
+1999-07-04 Sun 21:36:51 +0000 eddietwo <eddietwo>
+Commit ff64578a1b6e558ed2ccf8d9fba42a77d703b907
+
+ * mmpfb/: main.cc, myfont.cc, t1rewrit.cc, t1rewrit.hh: added
+ --subrs
+
+1999-06-30 Wed 15:41:12 +0000 eddietwo <eddietwo>
+Commit b545936303a30f9746de18d103ab967f40b7f218
+
+ * t1lint/main.cc: oopses
+
+1999-06-30 Wed 15:37:57 +0000 eddietwo <eddietwo>
+Commit 40d07c816cab02378620b9123c8378fc59879720
+
+ * t1lint/main.cc: thingies
+
+1999-06-30 Wed 15:22:31 +0000 eddietwo <eddietwo>
+Commit faff0b4f02a7aabe989c0aff43c1255ff3979c12
+
+ * t1lint/main.cc: in response to error/landmark updates
+
+1999-06-29 Tue 22:04:21 +0000 eddietwo <eddietwo>
+Commit bc9423b849f0f72c69b8b454ee6416b98af0026f
+
+ * t1lint/: cscheck.cc, cscheck.hh, hashmapi.cc, main.cc, point.cc,
+ point.hh, vectori.cc: added ifles
+
+1999-06-29 Tue 22:03:53 +0000 eddietwo <eddietwo>
+Commit 18a4296d30e0ee8b7d290162094fc2baa8979d06
+
+ * acconfig.h, t1lint/Makefile.am: t1lint
+
+1999-06-29 Tue 19:54:37 +0000 eddietwo <eddietwo>
+Commit a69ccf878e5df1e00863b79be5e1c45797e7244d
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/mmpfb.1, mmpfb/myfont.cc,
+ mmpfb/myfont.hh, mmpfb/t1rewrit.cc, mmpfb/t1rewrit.hh: changed to
+ align with new ErrorHandler
+
+1999-06-29 Tue 17:05:42 +0000 eddietwo <eddietwo>
+Commit 14ad86806e1432805a6d0f664a17c870dd4e4f8a
+
+ * .cvsignore, INSTALL, Makefile.am, NEWS, README, acconfig.h,
+ configure.in, edlib/Makefile.am, t1lib/Makefile.am,
+ t1lint/Makefile.am: first version
+
+1999-06-28 Mon 18:57:19 +0000 eddietwo <eddietwo>
+Commit b7b0d67510b9ef22172737dcae676a4813181203
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: manual fixes
+
+1999-06-28 Mon 18:50:36 +0000 eddietwo <eddietwo>
+Commit 58ab4517bacf5461d15063c1fc5e5feb189b65e0
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: manual fixes
+
+1999-06-28 Mon 18:45:46 +0000 eddietwo <eddietwo>
+Commit 026129d3a68f29df6c4c009ae5b5ccd54727f069
+
+ * mmafm/main.cc, mmafm/mmafm.1, mmpfb/main.cc, mmpfb/mmpfb.1:
+ interpolate an instance by name
+
+1999-06-26 Sat 17:33:48 +0000 eddietwo <eddietwo>
+Commit 60bbb9f209fa841d2360c841aa276ebbdd00e594
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1, mmpfb/myfont.cc: to 1.4.1
+
+1999-06-25 Fri 21:34:34 +0000 eddietwo <eddietwo>
+Commit 9f21c56fc1b28842dbb5563011b1f53c56ae11b8
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1, mmpfb/myfont.cc, mmpfb/myfont.hh:
+ to mminstance-1.4
+
+1999-05-21 Fri 20:17:51 +0000 eddietwo <eddietwo>
+Commit d5a1644f2a6f6d49f77a36a04d74a155992b6965
+
+ * mmafm/hashmapi.cc, mmafm/vectori.cc, mmpfb/hashmapi.cc,
+ mmpfb/myfont.cc, mmpfb/myfont.hh, mmpfb/t1rewrit.cc,
+ mmpfb/t1rewrit.hh, mmpfb/vectori.cc: pragmendectomy
+
+1999-05-21 Fri 20:00:49 +0000 eddietwo <eddietwo>
+Commit f60fe721dd64486cdba4afc8bd40cfe44f6ed29b
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: versionize
+
+1999-05-21 Fri 19:45:12 +0000 eddietwo <eddietwo>
+Commit 6563df4c25db9cfee1adcf57dc616aafa238817e
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/t1rewrit.cc,
+ mmpfb/t1rewrit.hh: - got rid of #pragmas - STL interface
+ conformance
+
+1999-04-11 Sun 22:05:17 +0000 eddietwo <eddietwo>
+Commit 138143ee6114f302a29d4778b739b901657292b2
+
+ * mmafm/main.cc, mmpfb/main.cc: second instance of 1.3; changed
+ --help text layout
+
+1999-04-11 Sun 21:57:32 +0000 eddietwo <eddietwo>
+Commit ba0a14d2f236b4a2c78861e0b22a728f715ce6f3
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: to version 1.3
+
+1999-01-25 Mon 17:03:41 +0000 eddietwo <eddietwo>
+Commit dab2b1373c0669808fe8ed9a282cbcd961e1f24d
+
+ * mmafm/main.cc, mmpfb/main.cc: probably just error messages
+
+1999-01-24 Sun 19:40:18 +0000 eddietwo <eddietwo>
+Commit 8d45d8e3af617cf178599f9b9839458a4fd18bbd
+
+ * mmpfb/: main.cc, mmpfb.1, myfont.cc, vectori.cc: accepts --quiet,
+ uses PsresDatabase
+
+1999-01-24 Sun 19:40:03 +0000 eddietwo <eddietwo>
+Commit 441fe8c43e78ef2d27d76df080f6eec888129374
+
+ * mmafm/: main.cc, mmafm.1, vectori.cc: now runs mmpfb to get the
+ AMCP program
+
+1999-01-22 Fri 22:55:23 +0000 eddietwo <eddietwo>
+Commit 79c3c17f1765faa0866400fa74c63f8296dfe204
+
+ * mmafm/hashmapi.cc, mmafm/main.cc, mmafm/vectori.cc,
+ mmpfb/hashmapi.cc, mmpfb/main.cc, mmpfb/myfont.cc,
+ mmpfb/t1rewrit.cc, mmpfb/vectori.cc: config.hized
+
+1999-01-12 Tue 19:56:49 +0000 eddietwo <eddietwo>
+Commit e86131998712429d5475fc60afea4522dcec917d
+
+ * mmafm/.cvsignore, mmpfb/.cvsignore: more .cvsignores
+
+1999-01-12 Tue 19:54:32 +0000 eddietwo <eddietwo>
+Commit 5fbab255597ca0b49c1ffd9ed796d8ce42d6464c
+
+ * mmafm/Makefile.am, mmafm/mmafm.1, mmpfb/Makefile.am,
+ mmpfb/mmpfb.1, mmpfb/myfont.cc: fixed mmpfb (maybe); to 1.3b1
+
+1999-01-02 Sat 22:23:59 +0000 eddietwo <eddietwo>
+Commit 7bf686f5712d51c8d19aa195542d111faefbb5ee
+
+ * mmpfb/myfont.cc: added a comment about the final underscore in
+ the font name
+
+1998-12-19 Sat 00:20:30 +0000 eddietwo <eddietwo>
+Commit a970f94d49c1d36a056b78249c2dd8060f5909f3
+
+ * mmafm/mmafm.1, mmpfb/mmpfb.1: actually 1.2
+
+1998-12-18 Fri 23:57:48 +0000 eddietwo <eddietwo>
+Commit a5b6e6d1b45583408e83249863faa05507125d46
+
+ * mmpfb/main.cc: short_usage label removed
+
+1998-12-18 Fri 23:50:09 +0000 eddietwo <eddietwo>
+Commit fd570af1998e15dda5490a9b019b96bdbb91dd8c
+
+ * mmafm/Makefile.am, mmafm/Makefile.in, mmafm/main.cc,
+ mmafm/mmafm.1, mmafm/mmafm.man, mmpfb/Makefile.am,
+ mmpfb/Makefile.in, mmpfb/main.cc, mmpfb/mmpfb.1, mmpfb/mmpfb.man:
+ initial switch to 1.2
+
+1998-09-27 Sun 19:58:15 +0000 eddietwo <eddietwo>
+Commit 68b864b17e237dc6e06a0c39dbff7bde83ad8b43
+
+ * mmpfb/Makefile.in: nmakefile stuff
+
+1998-09-27 Sun 19:57:16 +0000 eddietwo <eddietwo>
+Commit 24d26a865e45d263b05d9e06338e909b6704b03a
+
+ * mmafm/Makefile.in, mmpfb/Makefile.in: LIBS
+
+1998-09-27 Sun 19:51:09 +0000 eddietwo <eddietwo>
+Commit 66ad04f17ab5e23a55828eea4f74410503abc5bb
+
+ * mmafm/Makefile.in, mmpfb/Makefile.in: VPATH making
+
+1998-09-27 Sun 04:49:23 +0000 eddietwo <eddietwo>
+Commit 2878d0ca4b451045d28a94d3beb3f95aa4133733
+
+ * mmpfb/: Makefile.in, main.cc, mmpfb.man, myfont.cc, myfont.hh,
+ t1rewrit.cc, t1rewrit.hh, vectori.cc: * moved install target into
+ local makefile * changes for GNUCODSTD * improved mmpfb a lot (does
+ a better job)
+
+1998-09-27 Sun 04:49:02 +0000 eddietwo <eddietwo>
+Commit a3194e531cf6f7079c6d69cfb3871b6ded481bcf
+
+ * mmafm/: Makefile.in, main.cc, mmafm.man: * moved install target
+ into local makefile * changes for GNUCODSTD
+
+1998-09-18 Fri 17:34:46 +0000 eddietwo <eddietwo>
+Commit 2afaf2f1ac145c94392d965555466f62809644e7
+
+ * mmafm/main.cc, mmpfb/main.cc: That's right: message removed
+
+1998-09-17 Thu 16:51:22 +0000 eddietwo <eddietwo>
+Commit 7bd90e673914a3f13937e8d478ffca0fadd3ecb6
+
+ * mmafm/Makefile.in, mmpfb/Makefile.in: more configuration
+
+1998-09-17 Thu 01:10:43 +0000 eddietwo <eddietwo>
+Commit 5184eab2236917b85e333dbdfe92f685d3add61d
+
+ * mmafm/mmafm.man, mmpfb/mmpfb.man: forgot the man pages
+
+1998-09-17 Thu 01:10:24 +0000 eddietwo <eddietwo>
+Commit ce2a15dbc5f8c684862ed630739a6be70cc95a9a
+
+ * mmafm/Makefile.in, mmafm/mmafm.min, mmpfb/Makefile.in,
+ mmpfb/mmpfb.min: to 1.0; mostly config changes
+
+1998-09-02 Wed 19:00:15 +0000 eddietwo <eddietwo>
+Commit 53383726d8f5267072d6402043e1c07a6d15225d
+
+ * mmafm/Makefile.in, mmafm/main.cc, mmpfb/Makefile.in,
+ mmpfb/main.cc: changes from summer
+
+1998-05-26 Tue 06:31:33 +0000 eddietwo <eddietwo>
+Commit b2cbfe298843ccf07f6cf3def616da1d93ac4bdb
+
+ * mmafm/Makefile.in, mmpfb/Makefile.in: Makefile.in cosmetics
+
+1998-05-15 Fri 21:24:20 +0000 eddietwo <eddietwo>
+Commit 4b1aed5a0a3c17313c7439ab124ba14ab729c219
+
+ * mmafm/main.cc: changes to 0.91 (mmafm bug fixes)
+
+1998-04-07 Tue 21:45:49 +0000 eddietwo <eddietwo>
+Commit b4c3ab6949546dd2053b705a7f36cc8762e7ed6f
+
+ * mmafm/hashmapi.cc, mmpfb/hashmapi.cc: #pragma implementation
+
+1998-04-07 Tue 21:42:20 +0000 eddietwo <eddietwo>
+Commit 6f2a9854503f03f8653bf729cc6433eef0fe80cf
+
+ * mmpfb/myfont.cc: Changes to work with t1lib
+
+1998-04-03 Fri 14:32:36 +0000 eddietwo <eddietwo>
+Commit 532168e307090d8bde66fc84b61f274af160b809
+
+ * mmafm/main.cc, mmpfb/main.cc, mmpfb/myfont.cc: Changes to keep up
+ with t1lib,etc.
+
+1998-03-27 Fri 19:30:49 +0000 eddietwo <eddietwo>
+Commit 78bdd5e23045c56bac9052c5696e131e1de5d0d6
+
+ * mmafm/Makefile.in, mmafm/main.cc, mmpfb/Makefile.in,
+ mmpfb/main.cc: FontFinder -> MetricsFinder and Type1MMSpace::create
+ --> Type1Font
+
+1998-03-04 Wed 18:15:38 +0000 eddietwo <eddietwo>
+Commit 86ae5faf3c186512e6d530f5aed58e26e4967507
+
+ * mmafm/Makefile.in, mmafm/main.cc, mmpfb/Makefile.in,
+ mmpfb/main.cc: changed configuration and 1997 -> 1997-8
+
+1998-03-04 Wed 17:43:07 +0000 eddietwo <eddietwo>
+Commit c17b3095e2c8ca646bfb3804ef60f9c5451927ef
+
+ * mmafm/Makefile.in, mmafm/mmafm.min, mmpfb/Makefile.in,
+ mmpfb/mmpfb.min: Changed installation; added `-o t1mm.o' to
+ submakefiles
+
+1998-03-04 Wed 17:31:19 +0000 eddietwo <eddietwo>
+Commit 82a9536ebca7b8f60e59db18dd3b7e7e0df7aca6
+
+ * mmafm/main.cc, mmafm/mmafm.min, mmpfb/mmpfb.min: Added manual
+ pages; v0.8->v0.9
+
+1998-03-03 Tue 23:19:34 +0000 eddietwo <eddietwo>
+Commit e634b39c6171b142fe3173f8c2072fe5245634e7
+
+ * mmafm/Makefile.in, mmafm/hashmapi.cc, mmafm/main.cc,
+ mmafm/vectori.cc, mmpfb/Makefile.in, mmpfb/hashmapi.cc,
+ mmpfb/main.cc, mmpfb/myfont.cc, mmpfb/myfont.hh, mmpfb/vectori.cc:
+ Initial revision
+
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index d03fd0071ca..69e545394aa 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -72,5 +72,6 @@ srclinks:
versionize:
perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
+ perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
.PHONY: srclinks rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1reencode t1testpage ttftotype42
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 3cb144ea26f..b010058122d 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -37,14 +33,14 @@ POST_UNINSTALL = :
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure COPYING INSTALL NEWS depcomp \
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL NEWS depcomp \
install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -52,10 +48,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -65,6 +62,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgdatadir)"
pkgdataDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgdata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -79,8 +78,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -104,6 +101,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -116,9 +115,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -134,14 +132,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -149,24 +145,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign check-news
SUBDIRS = liblcdf libefont @SELECTED_SUBDIRS@
DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1reencode t1testpage ttftotype42
@@ -265,7 +272,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -278,10 +285,9 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-uninstall-info-am:
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
@list='$(pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -328,8 +334,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -437,24 +442,22 @@ distdir: $(DISTFILES)
exit 1;; \
esac
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/include/efont $(distdir)/include/lcdf
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -468,7 +471,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -476,6 +479,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -483,7 +488,7 @@ distdir: $(DISTFILES)
-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 \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -558,7 +563,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -583,7 +588,7 @@ all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgdatadir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -630,12 +635,20 @@ info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -656,24 +669,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+uninstall-am: uninstall-pkgdataDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-recursive distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-pkgdataDATA install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am uninstall-pkgdataDATA
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-pkgdataDATA \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgdataDATA
liblcdf libefont:
@@ -689,6 +704,7 @@ srclinks:
versionize:
perl -pi -e 's/^\.ds V.*/.ds V $(VERSION)/;' $(top_srcdir)/cfftot1/cfftot1.1 $(top_srcdir)/mmafm/mmafm.1 $(top_srcdir)/mmpfb/mmpfb.1 $(top_srcdir)/otfinfo/otfinfo.1 $(top_srcdir)/otftotfm/otftotfm.1 $(top_srcdir)/t1dotlessj/t1dotlessj.1 $(top_srcdir)/t1lint/t1lint.1 $(top_srcdir)/t1reencode/t1reencode.1 $(top_srcdir)/t1testpage/t1testpage.1 $(top_srcdir)/ttftotype42/ttftotype42.1
perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README
+ perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec
.PHONY: srclinks rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1reencode t1testpage ttftotype42
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/lcdf-typetools/NEWS b/Build/source/texk/lcdf-typetools/NEWS
index a883624ebdc..496739e872f 100644
--- a/Build/source/texk/lcdf-typetools/NEWS
+++ b/Build/source/texk/lcdf-typetools/NEWS
@@ -1,5 +1,11 @@
LCDF Typetools NEWS
+Version 2.67 25.Apr.2008
+
+* otftotfm: Improve font name construction for base fonts. Reported by
+ Ulrich Dirr.
+
+
Version 2.66 3.Aug.2007
* otftotfm: TrueType fonts had inappropriately large kerning pairs; fixed.
diff --git a/Build/source/texk/lcdf-typetools/README b/Build/source/texk/lcdf-typetools/README
index 01dbe534d9e..4a7ad78ba42 100644
--- a/Build/source/texk/lcdf-typetools/README
+++ b/Build/source/texk/lcdf-typetools/README
@@ -1,4 +1,4 @@
-LCDF-TYPETOOLS 2.66
+LCDF-TYPETOOLS 2.67
===================
USAGE
diff --git a/Build/source/texk/lcdf-typetools/aclocal.m4 b/Build/source/texk/lcdf-typetools/aclocal.m4
index b7a0e851eea..574831d889b 100644
--- a/Build/source/texk/lcdf-typetools/aclocal.m4
+++ b/Build/source/texk/lcdf-typetools/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -21,14 +26,29 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -85,14 +105,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -101,8 +121,10 @@ AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -116,15 +138,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -152,6 +173,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -217,6 +239,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -269,7 +292,8 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -294,8 +318,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -354,8 +379,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -378,16 +403,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -407,6 +436,9 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -442,6 +474,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -477,7 +513,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -584,14 +620,14 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -607,6 +643,7 @@ AC_SUBST($1)])
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -617,7 +654,7 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -625,60 +662,23 @@ fi
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
@@ -790,9 +790,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
index 11e6827e9d7..1753ef0a6d4 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_cfftot1_OBJECTS = cfftot1.$(OBJEXT) maket1font.$(OBJEXT)
cfftot1_OBJECTS = $(am_cfftot1_OBJECTS)
cfftot1_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -71,8 +67,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -96,6 +90,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,9 +104,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -126,14 +121,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -141,24 +134,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = cfftot1.1
cfftot1_SOURCES = cfftot1.cc \
@@ -203,7 +207,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -226,7 +230,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
cfftot1$(EXEEXT): $(cfftot1_OBJECTS) $(cfftot1_DEPENDENCIES)
@rm -f cfftot1$(EXEEXT)
- $(CXXLINK) $(cfftot1_LDFLAGS) $(cfftot1_OBJECTS) $(cfftot1_LDADD) $(LIBS)
+ $(CXXLINK) $(cfftot1_OBJECTS) $(cfftot1_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -238,22 +242,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maket1font.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -346,22 +349,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -377,7 +379,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -426,12 +428,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -451,21 +461,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
index f2c2036dfcb..50b7b7a7e1b 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
+++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1
@@ -1,4 +1,4 @@
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
index 4f43d15742c..47d67596817 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
+++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.cc
@@ -46,12 +46,12 @@ using namespace Efont;
#define OUTPUT_OPT 306
#define NAME_OPT 307
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "ascii", 'a', PFA_OPT, 0, 0 },
{ "binary", 'b', PFB_OPT, 0, 0 },
{ "help", 'h', HELP_OPT, 0, 0 },
- { "name", 'n', NAME_OPT, Clp_ArgString, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "name", 'n', NAME_OPT, Clp_ValString, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "pfa", 'a', PFA_OPT, 0, 0 },
{ "pfb", 'b', PFB_OPT, 0, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
@@ -197,7 +197,7 @@ main(int argc, char *argv[])
case NAME_OPT:
if (font_name)
usage_error(errh, "font name specified twice");
- font_name = clp->arg;
+ font_name = clp->vstr;
break;
case QUIET_OPT:
@@ -225,7 +225,7 @@ particular purpose.\n");
output_file:
if (output_file)
usage_error(errh, "output file specified twice");
- output_file = clp->arg;
+ output_file = clp->vstr;
break;
case Clp_NotOption:
@@ -234,7 +234,7 @@ particular purpose.\n");
else if (input_file)
goto output_file;
else
- input_file = clp->arg;
+ input_file = clp->vstr;
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/config.h.in b/Build/source/texk/lcdf-typetools/config.h.in
index 6ed2f7049ab..2e7760b31dc 100644
--- a/Build/source/texk/lcdf-typetools/config.h.in
+++ b/Build/source/texk/lcdf-typetools/config.h.in
@@ -167,13 +167,13 @@
/* Data directory. */
#undef SHAREDIR
-/* The size of a `unsigned int', as computed by sizeof. */
+/* The size of `unsigned int', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_INT
-/* The size of a `unsigned long', as computed by sizeof. */
+/* The size of `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
-/* The size of a `void *', as computed by sizeof. */
+/* The size of `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P
/* Define to 1 if you have the ANSI C header files. */
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index bb5e80bc8f1..248c3f03dca 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62.
+# Generated by GNU Autoconf 2.61.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -37,45 +37,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
# Support unset when possible.
@@ -91,6 +63,8 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -113,7 +87,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -126,10 +100,17 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+done
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -151,7 +132,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -177,7 +158,7 @@ else
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -259,7 +240,7 @@ IFS=$as_save_IFS
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -280,7 +261,7 @@ _ASEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -360,10 +341,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -432,10 +413,9 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell bug-autoconf@gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
+ echo Please tell autoconf@gnu.org about your system,
+ echo including any error possibly output before this
+ echo message
}
@@ -471,7 +451,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -499,6 +479,7 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -511,22 +492,19 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
+ mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
else
as_ln_s='cp -p'
fi
@@ -551,10 +529,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -675,6 +653,7 @@ target_alias
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -732,26 +711,6 @@ FIXLIBC_O
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-enable_dependency_tracking
-enable_cfftot1
-enable_mmafm
-enable_mmpfb
-enable_otfinfo
-enable_otftotfm
-enable_t1lint
-enable_t1reencode
-enable_t1testpage
-enable_ttftotype42
-enable_tetex_build
-with_kpathsea
-enable_selfauto_set
-enable_auto_cfftot1
-enable_auto_t1dotlessj
-enable_auto_updmap
-'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -770,8 +729,6 @@ CXXCPP'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -870,21 +827,13 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -897,21 +846,13 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1102,38 +1043,22 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
- ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
--x)
# Obsolete; use --with-x.
@@ -1153,7 +1078,7 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1162,16 +1087,16 @@ Try \`$0 --help' for more information." >&2
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1180,38 +1105,22 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+ { echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
+# Be sure to have absolute directory names.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1226,7 +1135,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1242,10 +1151,10 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+ { echo "$as_me: error: Working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1253,12 +1162,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_myself" : 'X\(//\)[^/]' \| \
- X"$as_myself" : 'X\(//\)$' \| \
- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+ ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1285,12 +1194,12 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1339,9 +1248,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1351,25 +1260,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1386,7 +1295,6 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
@@ -1437,17 +1345,15 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
+ test -d "$ac_dir" || continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1483,7 +1389,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1493,10 +1399,10 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.62
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1507,7 +1413,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.62. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1543,7 +1449,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
+ echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1578,7 +1484,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1630,12 +1536,11 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1665,9 +1570,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1682,9 +1587,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1700,8 +1605,8 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1743,24 +1648,21 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
+# Prefer explicitly selected file to automatically selected ones.
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ set x "$CONFIG_SITE"
elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ set x "$ac_default_prefix/share/config.site" \
+ "$ac_default_prefix/etc/config.site"
fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+shift
+for ac_site_file
do
- test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1770,16 +1672,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1793,38 +1695,29 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- # differences in whitespace do not lead to failure.
- ac_old_val_w=`echo x $ac_old_val`
- ac_new_val_w=`echo x $ac_new_val`
- if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- ac_cache_corrupted=:
- else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
- eval $ac_var=\$ac_old_val
- fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1834,10 +1727,10 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1864,7 +1757,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -1882,8 +1776,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
fi
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1909,12 +1803,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -1943,29 +1836,17 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
fi
fi
done
done
;;
esac
-
done
IFS=$as_save_IFS
-rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -1978,8 +1859,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -1989,8 +1870,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -2013,9 +1894,9 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2026,23 +1907,26 @@ then
# Ok.
:
else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
+echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
+# Double any \ or $. echo might interpret backslashes.
# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -2053,51 +1937,66 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2110,7 +2009,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2121,23 +2020,22 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+ { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2154,12 +2052,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2172,12 +2070,16 @@ else
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2192,7 +2094,7 @@ fi
# Define the identity of the package.
PACKAGE=lcdf-typetools
- VERSION=2.66
+ VERSION=2.67
cat >>confdefs.h <<_ACEOF
@@ -2220,7 +2122,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2230,10 +2132,10 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2246,7 +2148,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2257,11 +2159,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2270,10 +2172,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2286,7 +2188,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2297,11 +2199,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -2309,10 +2211,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -2324,7 +2226,7 @@ else
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2340,8 +2242,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
ac_config_headers="$ac_config_headers config.h"
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2349,11 +2251,9 @@ else
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2365,12 +2265,11 @@ fi
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2387,12 +2286,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2405,10 +2304,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2421,7 +2320,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2432,11 +2331,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2445,10 +2344,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2461,7 +2360,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2472,11 +2371,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2484,10 +2383,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -2502,10 +2401,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2518,7 +2417,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2529,11 +2428,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2542,10 +2441,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2563,7 +2462,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2586,11 +2485,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2601,10 +2500,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2617,7 +2516,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2628,11 +2527,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2645,10 +2544,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2661,7 +2560,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2672,11 +2571,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -2688,10 +2587,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -2703,48 +2602,44 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@ -2763,22 +2658,27 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort. b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions. Remove them first so a
+# subsequent execution test works.
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
@@ -2789,11 +2689,10 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2804,7 +2703,7 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
@@ -2831,15 +2730,15 @@ else
ac_file=''
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
+echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
fi
@@ -2848,8 +2747,8 @@ ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -2858,51 +2757,49 @@ if test "$cross_compiling" != yes; then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
+echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -2911,31 +2808,31 @@ $as_echo "$ac_try_echo") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
if test "${ac_cv_objext+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2958,41 +2855,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3018,21 +2914,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -3042,19 +2937,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@ -3081,21 +2972,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@ -3120,21 +3010,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3160,21 +3049,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3189,8 +3077,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -3206,10 +3094,10 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@ -3280,21 +3168,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3310,15 +3197,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@ -3339,8 +3226,8 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
am__include="#"
am__quote=
_am_result=none
@@ -3367,8 +3254,8 @@ if test "$am__include" = "#"; then
fi
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
@@ -3380,9 +3267,7 @@ if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3392,13 +3277,12 @@ fi
-
depcc="$CC" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -3460,6 +3344,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3485,13 +3370,11 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -3507,15 +3390,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3547,21 +3430,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -3585,14 +3467,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -3600,7 +3481,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -3625,8 +3506,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -3654,21 +3535,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -3692,14 +3572,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -3707,7 +3586,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -3723,9 +3602,9 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3750,10 +3629,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -3766,7 +3645,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3777,11 +3656,11 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+ { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -3794,10 +3673,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -3810,7 +3689,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3821,11 +3700,11 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -3837,10 +3716,10 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -3852,47 +3731,43 @@ fi
fi
fi
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3918,21 +3793,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -3942,19 +3816,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
-else
- GXX=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+GXX=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
@@ -3981,21 +3851,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
@@ -4020,21 +3889,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -4060,21 +3928,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -4089,8 +3956,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@ -4114,10 +3981,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CXX" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -4179,6 +4046,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4204,13 +4072,11 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -4226,11 +4092,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -4262,21 +4128,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4300,14 +4165,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
@@ -4315,7 +4179,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4340,8 +4204,8 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
@@ -4369,21 +4233,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4407,14 +4270,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
@@ -4422,7 +4284,7 @@ $as_echo "$ac_try_echo") >&5
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4438,9 +4300,9 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4457,10 +4319,10 @@ if test -n "$GCC" ; then CC="$CC -W -Wall" ; CXX="$CXX -W -Wall" ; fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -4473,7 +4335,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -4484,11 +4346,11 @@ fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
@@ -4497,10 +4359,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -4513,7 +4375,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -4524,11 +4386,11 @@ fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -4536,10 +4398,10 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
@@ -4554,10 +4416,10 @@ fi
-{ $as_echo "$as_me:$LINENO: checking where template objects are stored" >&5
-$as_echo_n "checking where template objects are stored... " >&6; }
+{ echo "$as_me:$LINENO: checking where template objects are stored" >&5
+echo $ECHO_N "checking where template objects are stored... $ECHO_C" >&6; }
if test "${ac_cv_cxx_templobjs+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_cxx_templobjs='unknown'
if test "$GXX" = yes; then
@@ -4621,8 +4483,8 @@ EOF
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_templobjs" >&5
-$as_echo "$ac_cv_cxx_templobjs" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_templobjs" >&5
+echo "${ECHO_T}$ac_cv_cxx_templobjs" >&6; }
@@ -4634,11 +4496,11 @@ $as_echo "$ac_cv_cxx_templobjs" >&6; }
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4664,21 +4526,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -4686,14 +4547,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
ac_header_dirent=$ac_hdr; break
@@ -4702,10 +4561,10 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
if test "${ac_cv_search_opendir+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
@@ -4743,30 +4602,26 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_search_opendir=$ac_res
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
@@ -4781,8 +4636,8 @@ fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -4790,10 +4645,10 @@ if test "$ac_res" != no; then
fi
else
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
if test "${ac_cv_search_opendir+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
@@ -4831,30 +4686,26 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_search_opendir=$ac_res
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
@@ -4869,8 +4720,8 @@ fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -4984,14 +4835,14 @@ if test "x$kpathsea" = xno; then
else
if test "x$enable_tetex_build" = xyes; then
if test ! -d $srcdir/../../texk/kpathsea; then
- { { $as_echo "$as_me:$LINENO: error:
+ { { echo "$as_me:$LINENO: error:
=========================================
You specified --enable-tetex-build, but I can't find the kpathsea
directory. I expected it to be in $srcdir/../../texk/kpathsea.
=========================================" >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
=========================================
You specified --enable-tetex-build, but I can't find the kpathsea
@@ -5002,8 +4853,8 @@ directory. I expected it to be in $srcdir/../../texk/kpathsea.
fi
CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/../../texk -I\$(top_srcdir)/../../texk"
LDFLAGS="$LDFLAGS -L\$(top_builddir)/../../texk/kpathsea/.libs"
- { $as_echo "$as_me:$LINENO: tetex build of lcdf-typetools, CPPFLAGS now: $CPPFLAGS" >&5
-$as_echo "$as_me: tetex build of lcdf-typetools, CPPFLAGS now: $CPPFLAGS" >&6;}
+ { echo "$as_me:$LINENO: tetex build of lcdf-typetools, CPPFLAGS now: $CPPFLAGS" >&5
+echo "$as_me: tetex build of lcdf-typetools, CPPFLAGS now: $CPPFLAGS" >&6;}
elif test "x$kpathsea" != x -a "x$kpathsea" != xyes; then
CPPFLAGS="$CPPFLAGS -I$kpathsea/include"
LDFLAGS="$LDFLAGS -L$kpathsea/lib"
@@ -5015,37 +4866,42 @@ $as_echo "$as_me: tetex build of lcdf-typetools, CPPFLAGS now: $CPPFLAGS" >&6;}
kpse_header=yes
else
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -z "$GREP"; then
ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
+ echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -5060,60 +4916,74 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
- $ac_path_GREP_found && break 3
- done
+
+ $ac_path_GREP_found && break 3
done
done
+
+done
IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
- fi
+fi
+
else
ac_cv_path_GREP=$GREP
fi
+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- if test -z "$EGREP"; then
+ # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
+ echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -5128,31 +4998,40 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
- $ac_path_EGREP_found && break 3
- done
+
+ $ac_path_EGREP_found && break 3
done
done
+
+done
IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
- fi
+fi
+
else
ac_cv_path_EGREP=$EGREP
fi
+
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5179,21 +5058,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
@@ -5285,40 +5163,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -5340,11 +5215,11 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5362,21 +5237,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -5384,14 +5258,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5400,17 +5272,17 @@ done
if test "${ac_cv_header_kpathsea_kpathsea_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for kpathsea/kpathsea.h" >&5
-$as_echo_n "checking for kpathsea/kpathsea.h... " >&6; }
+ { echo "$as_me:$LINENO: checking for kpathsea/kpathsea.h" >&5
+echo $ECHO_N "checking for kpathsea/kpathsea.h... $ECHO_C" >&6; }
if test "${ac_cv_header_kpathsea_kpathsea_h+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_kpathsea_h" >&5
-$as_echo "$ac_cv_header_kpathsea_kpathsea_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_kpathsea_h" >&5
+echo "${ECHO_T}$ac_cv_header_kpathsea_kpathsea_h" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking kpathsea/kpathsea.h usability" >&5
-$as_echo_n "checking kpathsea/kpathsea.h usability... " >&6; }
+{ echo "$as_me:$LINENO: checking kpathsea/kpathsea.h usability" >&5
+echo $ECHO_N "checking kpathsea/kpathsea.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5426,33 +5298,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking kpathsea/kpathsea.h presence" >&5
-$as_echo_n "checking kpathsea/kpathsea.h presence... " >&6; }
+{ echo "$as_me:$LINENO: checking kpathsea/kpathsea.h presence" >&5
+echo $ECHO_N "checking kpathsea/kpathsea.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5466,64 +5337,63 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: kpathsea/kpathsea.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for kpathsea/kpathsea.h" >&5
-$as_echo_n "checking for kpathsea/kpathsea.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for kpathsea/kpathsea.h" >&5
+echo $ECHO_N "checking for kpathsea/kpathsea.h... $ECHO_C" >&6; }
if test "${ac_cv_header_kpathsea_kpathsea_h+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_kpathsea_kpathsea_h=$ac_header_preproc
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_kpathsea_h" >&5
-$as_echo "$ac_cv_header_kpathsea_kpathsea_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_kpathsea_h" >&5
+echo "${ECHO_T}$ac_cv_header_kpathsea_kpathsea_h" >&6; }
fi
if test $ac_cv_header_kpathsea_kpathsea_h = yes; then
@@ -5539,17 +5409,17 @@ fi
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
if test "${ac_cv_header_kpathsea_tex_file_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for kpathsea/tex-file.h" >&5
-$as_echo_n "checking for kpathsea/tex-file.h... " >&6; }
+ { echo "$as_me:$LINENO: checking for kpathsea/tex-file.h" >&5
+echo $ECHO_N "checking for kpathsea/tex-file.h... $ECHO_C" >&6; }
if test "${ac_cv_header_kpathsea_tex_file_h+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_tex_file_h" >&5
-$as_echo "$ac_cv_header_kpathsea_tex_file_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_tex_file_h" >&5
+echo "${ECHO_T}$ac_cv_header_kpathsea_tex_file_h" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking kpathsea/tex-file.h usability" >&5
-$as_echo_n "checking kpathsea/tex-file.h usability... " >&6; }
+{ echo "$as_me:$LINENO: checking kpathsea/tex-file.h usability" >&5
+echo $ECHO_N "checking kpathsea/tex-file.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5565,33 +5435,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking kpathsea/tex-file.h presence" >&5
-$as_echo_n "checking kpathsea/tex-file.h presence... " >&6; }
+{ echo "$as_me:$LINENO: checking kpathsea/tex-file.h presence" >&5
+echo $ECHO_N "checking kpathsea/tex-file.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5605,64 +5474,63 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: kpathsea/tex-file.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: kpathsea/tex-file.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: kpathsea/tex-file.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for kpathsea/tex-file.h" >&5
-$as_echo_n "checking for kpathsea/tex-file.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for kpathsea/tex-file.h" >&5
+echo $ECHO_N "checking for kpathsea/tex-file.h... $ECHO_C" >&6; }
if test "${ac_cv_header_kpathsea_tex_file_h+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_kpathsea_tex_file_h=$ac_header_preproc
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_tex_file_h" >&5
-$as_echo "$ac_cv_header_kpathsea_tex_file_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_tex_file_h" >&5
+echo "${ECHO_T}$ac_cv_header_kpathsea_tex_file_h" >&6; }
fi
if test $ac_cv_header_kpathsea_tex_file_h = yes; then
@@ -5677,10 +5545,10 @@ fi
if test "x$enable_tetex_build" = xyes; then
kpse_library=yes
else
- { $as_echo "$as_me:$LINENO: checking for kpse_set_program_name in -lkpathsea" >&5
-$as_echo_n "checking for kpse_set_program_name in -lkpathsea... " >&6; }
+ { echo "$as_me:$LINENO: checking for kpse_set_program_name in -lkpathsea" >&5
+echo $ECHO_N "checking for kpse_set_program_name in -lkpathsea... $ECHO_C" >&6; }
if test "${ac_cv_lib_kpathsea_kpse_set_program_name+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkpathsea $LIBS"
@@ -5712,36 +5580,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_kpathsea_kpse_set_program_name=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_kpathsea_kpse_set_program_name=no
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_kpse_set_program_name" >&5
-$as_echo "$ac_cv_lib_kpathsea_kpse_set_program_name" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_kpse_set_program_name" >&5
+echo "${ECHO_T}$ac_cv_lib_kpathsea_kpse_set_program_name" >&6; }
if test $ac_cv_lib_kpathsea_kpse_set_program_name = yes; then
kpse_library=yes
else
@@ -5751,7 +5615,7 @@ fi
fi
if test "x$kpse_header" != xyes -o "x$kpse_library" != xyes; then
- { { $as_echo "$as_me:$LINENO: error:
+ { { echo "$as_me:$LINENO: error:
=========================================
I can't find the kpathsea library and/or header files. Tell me where to look
@@ -5760,7 +5624,7 @@ PREFIX/include/kpathsea, and library under PREFIX/lib), or disable support
using --without-kpathsea.
=========================================" >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
=========================================
I can't find the kpathsea library and/or header files. Tell me where to look
@@ -5792,10 +5656,10 @@ _ACEOF
_ACEOF
else
- { $as_echo "$as_me:$LINENO: checking whether kpse_opentype_format is declared" >&5
-$as_echo_n "checking whether kpse_opentype_format is declared... " >&6; }
+ { echo "$as_me:$LINENO: checking whether kpse_opentype_format is declared" >&5
+echo $ECHO_N "checking whether kpse_opentype_format is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_kpse_opentype_format+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5822,21 +5686,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_have_decl_kpse_opentype_format=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_kpse_opentype_format=no
@@ -5844,8 +5707,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_kpse_opentype_format" >&5
-$as_echo "$ac_cv_have_decl_kpse_opentype_format" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_kpse_opentype_format" >&5
+echo "${ECHO_T}$ac_cv_have_decl_kpse_opentype_format" >&6; }
if test $ac_cv_have_decl_kpse_opentype_format = yes; then
cat >>confdefs.h <<_ACEOF
@@ -5883,7 +5746,7 @@ if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_tetex
SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null`
SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null`
if test -z "$SELFAUTODIR"; then
- { $as_echo "$as_me:$LINENO: WARNING:
+ { echo "$as_me:$LINENO: WARNING:
=========================================
Could not extract SELFAUTO variables from $kpsewhich.
@@ -5891,7 +5754,7 @@ Either supply the correct PREFIX to --with-kpathsea, or supply
--disable-selfauto-loc.
=========================================" >&5
-$as_echo "$as_me: WARNING:
+echo "$as_me: WARNING:
=========================================
Could not extract SELFAUTO variables from $kpsewhich.
@@ -5970,10 +5833,10 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking whether <new> works" >&5
-$as_echo_n "checking whether <new> works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether <new> works" >&5
+echo $ECHO_N "checking whether <new> works... $ECHO_C" >&6; }
if test "${ac_cv_good_new_hdr+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6000,35 +5863,31 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_good_new_hdr=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_good_new_hdr=no
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_good_new_hdr" >&5
-$as_echo "$ac_cv_good_new_hdr" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_good_new_hdr" >&5
+echo "${ECHO_T}$ac_cv_good_new_hdr" >&6; }
if test "$ac_cv_good_new_hdr" = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -6040,21 +5899,20 @@ fi
for ac_header in new.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6070,33 +5928,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6110,72 +5967,69 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -6195,11 +6049,11 @@ FIXLIBC_O=''
for ac_func in strerror
do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6252,41 +6106,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
:
else
@@ -6295,10 +6143,10 @@ fi
done
-{ $as_echo "$as_me:$LINENO: checking whether strtod works" >&5
-$as_echo_n "checking whether strtod works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether strtod works" >&5
+echo $ECHO_N "checking whether strtod works... $ECHO_C" >&6; }
if test "${ac_cv_working_strtod+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
ac_cv_working_strtod=yes
@@ -6324,39 +6172,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_working_strtod=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_working_strtod=no
fi
-rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_strtod" >&5
-$as_echo "$ac_cv_working_strtod" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_working_strtod" >&5
+echo "${ECHO_T}$ac_cv_working_strtod" >&6; }
if test $ac_cv_working_strtod = no; then
FIXLIBC_O='fixlibc.o'
@@ -6374,11 +6219,11 @@ fi
for ac_func in strtoul ctime mkstemp ftruncate sigaction waitpid
do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6431,50 +6276,44 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
-{ $as_echo "$as_me:$LINENO: checking for floor" >&5
-$as_echo_n "checking for floor... " >&6; }
+{ echo "$as_me:$LINENO: checking for floor" >&5
+echo $ECHO_N "checking for floor... $ECHO_C" >&6; }
if test "${ac_cv_func_floor+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6527,43 +6366,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_floor=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_floor=no
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_floor" >&5
-$as_echo "$ac_cv_func_floor" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_floor" >&5
+echo "${ECHO_T}$ac_cv_func_floor" >&6; }
if test $ac_cv_func_floor = yes; then
:
else
-{ $as_echo "$as_me:$LINENO: checking for floor in -lm" >&5
-$as_echo_n "checking for floor in -lm... " >&6; }
+{ echo "$as_me:$LINENO: checking for floor in -lm" >&5
+echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6; }
if test "${ac_cv_lib_m_floor+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
@@ -6595,36 +6430,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_m_floor=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_m_floor=no
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
-$as_echo "$ac_cv_lib_m_floor" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
+echo "${ECHO_T}$ac_cv_lib_m_floor" >&6; }
if test $ac_cv_lib_m_floor = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
@@ -6636,10 +6467,10 @@ fi
fi
-{ $as_echo "$as_me:$LINENO: checking for fabs" >&5
-$as_echo_n "checking for fabs... " >&6; }
+{ echo "$as_me:$LINENO: checking for fabs" >&5
+echo $ECHO_N "checking for fabs... $ECHO_C" >&6; }
if test "${ac_cv_func_fabs+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6692,43 +6523,39 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_fabs=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_fabs=no
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_fabs" >&5
-$as_echo "$ac_cv_func_fabs" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_fabs" >&5
+echo "${ECHO_T}$ac_cv_func_fabs" >&6; }
if test $ac_cv_func_fabs = yes; then
:
else
-{ $as_echo "$as_me:$LINENO: checking for fabs in -lm" >&5
-$as_echo_n "checking for fabs in -lm... " >&6; }
+{ echo "$as_me:$LINENO: checking for fabs in -lm" >&5
+echo $ECHO_N "checking for fabs in -lm... $ECHO_C" >&6; }
if test "${ac_cv_lib_m_fabs+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
@@ -6760,36 +6587,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_m_fabs=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_m_fabs=no
fi
-rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_fabs" >&5
-$as_echo "$ac_cv_lib_m_fabs" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_fabs" >&5
+echo "${ECHO_T}$ac_cv_lib_m_fabs" >&6; }
if test $ac_cv_lib_m_fabs = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
@@ -6807,21 +6630,20 @@ fi
for ac_header in unistd.h fcntl.h sys/time.h sys/wait.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6837,33 +6659,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6877,72 +6698,69 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -6957,21 +6775,20 @@ done
for ac_header in inttypes.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6987,33 +6804,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7027,72 +6843,69 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
have_inttypes_h=yes
else
@@ -7104,21 +6917,20 @@ done
for ac_header in sys/types.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7134,33 +6946,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7174,72 +6985,69 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
have_sys_types_h=yes
else
@@ -7250,10 +7058,10 @@ done
if test $have_inttypes_h = no -a $have_sys_types_h = yes; then
- { $as_echo "$as_me:$LINENO: checking for uintXX_t typedefs" >&5
-$as_echo_n "checking for uintXX_t typedefs... " >&6; }
+ { echo "$as_me:$LINENO: checking for uintXX_t typedefs" >&5
+echo $ECHO_N "checking for uintXX_t typedefs... $ECHO_C" >&6; }
if test "${ac_cv_uint_t+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7273,14 +7081,14 @@ fi
rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_uint_t" >&5
-$as_echo "$ac_cv_uint_t" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_uint_t" >&5
+echo "${ECHO_T}$ac_cv_uint_t" >&6; }
fi
if test $have_inttypes_h = no -a $have_sys_types_h = yes -a "$ac_cv_uint_t" = no; then
- { $as_echo "$as_me:$LINENO: checking for u_intXX_t typedefs" >&5
-$as_echo_n "checking for u_intXX_t typedefs... " >&6; }
+ { echo "$as_me:$LINENO: checking for u_intXX_t typedefs" >&5
+echo $ECHO_N "checking for u_intXX_t typedefs... $ECHO_C" >&6; }
if test "${ac_cv_u_int_t+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7300,8 +7108,8 @@ fi
rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_u_int_t" >&5
-$as_echo "$ac_cv_u_int_t" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_u_int_t" >&5
+echo "${ECHO_T}$ac_cv_u_int_t" >&6; }
fi
if test $have_inttypes_h = yes -o "$ac_cv_uint_t" = yes; then
:
@@ -7312,14 +7120,14 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
- { $as_echo "$as_me:$LINENO: WARNING:
+ { echo "$as_me:$LINENO: WARNING:
=========================================
Neither uint32_t nor u_int32_t defined by <inttypes.h> or <sys/types.h>!
Assuming \"short\" has 16 bits and \"int\" has 32 bits.
=========================================" >&5
-$as_echo "$as_me: WARNING:
+echo "$as_me: WARNING:
=========================================
Neither uint32_t nor u_int32_t defined by <inttypes.h> or <sys/types.h>!
@@ -7333,13 +7141,12 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
-$as_echo_n "checking for uintptr_t... " >&6; }
+{ echo "$as_me:$LINENO: checking for uintptr_t" >&5
+echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6; }
if test "${ac_cv_type_uintptr_t+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_type_uintptr_t=no
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7353,11 +7160,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
+typedef uintptr_t ac__type_new_;
int
main ()
{
-if (sizeof (uintptr_t))
- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
@@ -7368,37 +7178,59 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+ ac_cv_type_uintptr_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_uintptr_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6; }
+if test $ac_cv_type_uintptr_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINTPTR_T 1
+_ACEOF
+
+
+fi
+
+
+{ echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
+if test "${ac_cv_type_void_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-
+$ac_includes_default
+typedef void * ac__type_new_;
int
main ()
{
-if (sizeof ((uintptr_t)))
- return 0;
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
;
return 0;
}
@@ -7409,56 +7241,38 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
+ ac_cv_type_void_p=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_uintptr_t=yes
+ ac_cv_type_void_p=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
-$as_echo "$ac_cv_type_uintptr_t" >&6; }
-if test $ac_cv_type_uintptr_t = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINTPTR_T 1
-_ACEOF
-
-
-fi
-
+{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
-$as_echo_n "checking size of void *... " >&6; }
+{ echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_void_p+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
@@ -7469,10 +7283,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
test_array [0] = 0
;
@@ -7485,14 +7300,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -7506,10 +7320,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -7522,21 +7337,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_hi=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
@@ -7550,7 +7364,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
@@ -7560,10 +7374,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
@@ -7576,14 +7391,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -7597,10 +7411,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
@@ -7613,21 +7428,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_lo=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -7641,7 +7455,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
@@ -7661,10 +7475,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef void * ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -7677,21 +7492,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_hi=$ac_mid
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -7702,9 +7516,9 @@ done
case $ac_lo in
?*) ac_cv_sizeof_void_p=$ac_lo;;
'') if test "$ac_cv_type_void_p" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (void *)
+echo "$as_me: error: cannot compute sizeof (void *)
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
else
@@ -7719,8 +7533,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-static long int longval () { return (long int) (sizeof (void *)); }
-static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
+ typedef void * ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
@@ -7730,22 +7545,20 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
- if (((long int) (sizeof (void *))) < 0)
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
{
long int i = longval ();
- if (i != ((long int) (sizeof (void *))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%ld", i);
+ fprintf (f, "%ld\n", i);
}
else
{
unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (void *))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%lu", i);
+ fprintf (f, "%lu\n", i);
}
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
return ferror (f) || fclose (f) != 0;
;
@@ -7758,46 +7571,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_void_p=`cat conftest.val`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
if test "$ac_cv_type_void_p" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (void *)
+echo "$as_me: error: cannot compute sizeof (void *)
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
else
ac_cv_sizeof_void_p=0
fi
fi
-rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-$as_echo "$ac_cv_sizeof_void_p" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
@@ -7806,14 +7616,68 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+{ echo "$as_me:$LINENO: checking for unsigned long" >&5
+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+if test "${ac_cv_type_unsigned_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef unsigned long ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_unsigned_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_unsigned_long=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5
-$as_echo_n "checking size of unsigned long... " >&6; }
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
@@ -7824,10 +7688,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
test_array [0] = 0
;
@@ -7840,14 +7705,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -7861,10 +7725,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -7877,21 +7742,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_hi=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
@@ -7905,7 +7769,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
@@ -7915,10 +7779,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
@@ -7931,14 +7796,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -7952,10 +7816,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
@@ -7968,21 +7833,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_lo=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -7996,7 +7860,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
@@ -8016,10 +7880,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned long ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -8032,21 +7897,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_hi=$ac_mid
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -8057,9 +7921,9 @@ done
case $ac_lo in
?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
'') if test "$ac_cv_type_unsigned_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
+echo "$as_me: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
else
@@ -8074,8 +7938,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-static long int longval () { return (long int) (sizeof (unsigned long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); }
+ typedef unsigned long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
@@ -8085,22 +7950,20 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
- if (((long int) (sizeof (unsigned long))) < 0)
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
{
long int i = longval ();
- if (i != ((long int) (sizeof (unsigned long))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%ld", i);
+ fprintf (f, "%ld\n", i);
}
else
{
unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (unsigned long))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%lu", i);
+ fprintf (f, "%lu\n", i);
}
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
return ferror (f) || fclose (f) != 0;
;
@@ -8113,46 +7976,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_long=`cat conftest.val`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
if test "$ac_cv_type_unsigned_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
+echo "$as_me: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
else
ac_cv_sizeof_unsigned_long=0
fi
fi
-rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
@@ -8161,14 +8021,68 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+{ echo "$as_me:$LINENO: checking for unsigned int" >&5
+echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6; }
+if test "${ac_cv_type_unsigned_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+typedef unsigned int ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_unsigned_int=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_unsigned_int=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6; }
+
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of unsigned int" >&5
-$as_echo_n "checking size of unsigned int... " >&6; }
+{ echo "$as_me:$LINENO: checking size of unsigned int" >&5
+echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_unsigned_int+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
@@ -8179,10 +8093,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
test_array [0] = 0
;
@@ -8195,14 +8110,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8216,10 +8130,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -8232,21 +8147,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_hi=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr $ac_mid + 1`
@@ -8260,7 +8174,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
@@ -8270,10 +8184,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
@@ -8286,14 +8201,13 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -8307,10 +8221,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
@@ -8323,21 +8238,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_lo=$ac_mid; break
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -8351,7 +8265,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo= ac_hi=
@@ -8371,10 +8285,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+ typedef unsigned int ac__type_sizeof_;
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
test_array [0] = 0
;
@@ -8387,21 +8302,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_hi=$ac_mid
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -8412,9 +8326,9 @@ done
case $ac_lo in
?*) ac_cv_sizeof_unsigned_int=$ac_lo;;
'') if test "$ac_cv_type_unsigned_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned int)
+echo "$as_me: error: cannot compute sizeof (unsigned int)
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
else
@@ -8429,8 +8343,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-static long int longval () { return (long int) (sizeof (unsigned int)); }
-static unsigned long int ulongval () { return (long int) (sizeof (unsigned int)); }
+ typedef unsigned int ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
@@ -8440,22 +8355,20 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
return 1;
- if (((long int) (sizeof (unsigned int))) < 0)
+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
{
long int i = longval ();
- if (i != ((long int) (sizeof (unsigned int))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%ld", i);
+ fprintf (f, "%ld\n", i);
}
else
{
unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (unsigned int))))
+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
return 1;
- fprintf (f, "%lu", i);
+ fprintf (f, "%lu\n", i);
}
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
return ferror (f) || fclose (f) != 0;
;
@@ -8468,46 +8381,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_int=`cat conftest.val`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
if test "$ac_cv_type_unsigned_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned int)
+echo "$as_me: error: cannot compute sizeof (unsigned int)
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
else
ac_cv_sizeof_unsigned_int=0
fi
fi
-rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5
-$as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6; }
@@ -8530,21 +8440,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
for ac_header in byteorder.h netinet/in.h sys/param.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8560,33 +8469,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8600,80 +8508,77 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-{ $as_echo "$as_me:$LINENO: checking whether ntohs and ntohl are defined" >&5
-$as_echo_n "checking whether ntohs and ntohl are defined... " >&6; }
+{ echo "$as_me:$LINENO: checking whether ntohs and ntohl are defined" >&5
+echo $ECHO_N "checking whether ntohs and ntohl are defined... $ECHO_C" >&6; }
ac_ntoh_defined=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -8706,27 +8611,26 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
ac_ntoh_defined=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8734,21 +8638,20 @@ if test $ac_ntoh_defined = no; then
for ac_header in arpa/inet.h
do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8764,33 +8667,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8804,72 +8706,69 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
have_arpa_inet_h=yes
else
@@ -8879,8 +8778,8 @@ fi
done
if test $have_arpa_inet_h = yes; then
- { $as_echo "$as_me:$LINENO: checking whether ntohs and ntohl are defined in <arpa/inet.h>" >&5
-$as_echo_n "checking whether ntohs and ntohl are defined in <arpa/inet.h>... " >&6; }
+ { echo "$as_me:$LINENO: checking whether ntohs and ntohl are defined in <arpa/inet.h>" >&5
+echo $ECHO_N "checking whether ntohs and ntohl are defined in <arpa/inet.h>... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8906,20 +8805,19 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
cat >>confdefs.h <<\_ACEOF
#define NEED_ARPA_INET_H 1
@@ -8927,24 +8825,24 @@ _ACEOF
ac_ntoh_defined=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
if test $ac_ntoh_defined = no; then
- { { $as_echo "$as_me:$LINENO: error:
+ { { echo "$as_me:$LINENO: error:
=========================================
Cannot find a definition for ntohs and/or ntohl!
=========================================" >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
=========================================
Cannot find a definition for ntohs and/or ntohl!
@@ -8967,10 +8865,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for addressable va_list type" >&5
-$as_echo_n "checking for addressable va_list type... " >&6; }
+{ echo "$as_me:$LINENO: checking for addressable va_list type" >&5
+echo $ECHO_N "checking for addressable va_list type... $ECHO_C" >&6; }
if test "${ac_cv_va_list_addr+set}" = set; then
- $as_echo_n "(cached) " >&6
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9004,21 +8902,20 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_va_list_addr=yes
else
- $as_echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_va_list_addr=no
@@ -9026,8 +8923,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_va_list_addr" >&5
-$as_echo "$ac_cv_va_list_addr" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_va_list_addr" >&5
+echo "${ECHO_T}$ac_cv_va_list_addr" >&6; }
if test "x$ac_cv_va_list_addr" = xyes; then
cat >>confdefs.h <<\_ACEOF
@@ -9105,12 +9002,11 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -9143,12 +9039,12 @@ $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -9164,7 +9060,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9176,41 +9072,40 @@ LTLIBOBJS=$ac_ltlibobjs
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -9223,7 +9118,7 @@ ac_cs_silent=false
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -9233,7 +9128,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -9255,45 +9150,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
# Support unset when possible.
@@ -9309,6 +9176,8 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
+as_nl='
+'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9331,7 +9200,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -9344,10 +9213,17 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ fi
+done
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -9369,7 +9245,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -9420,7 +9296,7 @@ $as_unset CDPATH
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -9448,6 +9324,7 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -9460,22 +9337,19 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
+ mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
else
as_ln_s='cp -p'
fi
@@ -9500,10 +9374,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -9526,7 +9400,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.62. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -9539,7 +9413,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
@@ -9547,7 +9421,7 @@ config_commands="$ac_config_commands"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
@@ -9560,9 +9434,9 @@ Usage: $0 [OPTIONS] [FILE]...
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -9576,25 +9450,25 @@ $config_commands
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.62,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
+MKDIR_P='$MKDIR_P'
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value. By we need to know if files were specified by the user.
ac_need_defaults=:
while test $# != 0
do
@@ -9616,36 +9490,30 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
+ echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { $as_echo "$as_me: error: ambiguous option: $1
+ { echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; };;
--help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
+ -*) { echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@ -9664,29 +9532,27 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ CONFIG_SHELL=$SHELL
export CONFIG_SHELL
- exec "\$@"
+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- $as_echo "$ac_log"
+ echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
#
# INIT-COMMANDS
#
@@ -9694,7 +9560,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -9716,8 +9582,8 @@ do
"t1testpage/Makefile") CONFIG_FILES="$CONFIG_FILES t1testpage/Makefile" ;;
"ttftotype42/Makefile") CONFIG_FILES="$CONFIG_FILES ttftotype42/Makefile" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@ -9758,143 +9624,160 @@ $debug ||
(umask 077 && mkdir "$tmp")
} ||
{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
+ echo "$me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
-ac_cr=' '
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+ cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+RANLIB!$RANLIB$ac_delim
+TEMPLATE_OBJS!$TEMPLATE_OBJS$ac_delim
+SELECTED_SUBDIRS!$SELECTED_SUBDIRS$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+KPSEINTERFACE_O!$KPSEINTERFACE_O$ac_delim
+LIBKPATHSEA!$LIBKPATHSEA$ac_delim
+LIBKPATHSEA_DEP!$LIBKPATHSEA_DEP$ac_delim
+FIXLIBC_O!$FIXLIBC_O$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = ""
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field[1])
- for (i = 2; i < nfields; i++) {
- key = field[i]
- keylen = length(key)
- if (S_is_set[key]) {
- value = S[key]
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field[++i])
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
-_ACAWK
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
_ACEOF
+
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -9910,133 +9793,19 @@ s/^[^=]*=[ ]*$//
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
fi # test -n "$CONFIG_FILES"
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
- break
- elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[ ]*#[ ]*define[ ][ ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_set[key] = 1
- FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg[1] == "#") {
- defundef = arg[2]
- mac1 = arg[3]
- } else {
- defundef = substr(arg[1], 2)
- mac1 = arg[2]
- }
- split(mac1, mac2, "(") #)
- macro = mac2[1]
- if (D_is_set[macro]) {
- # Preserve the white space surrounding the "#".
- prefix = substr(line, 1, index(line, defundef) - 1)
- print prefix "define", macro P[macro] D[macro]
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", line, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
-shift
-for ac_tag
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -10065,38 +9834,26 @@ $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
+ ac_file_inputs="$ac_file_inputs $ac_f"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
- `' by configure.'
+ configure_input="Generated from "`IFS=:
+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/[\\\\&|]/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *:-:* | *:-) cat >"$tmp/stdin";;
esac
;;
esac
@@ -10106,7 +9863,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10132,7 +9889,7 @@ $as_echo X"$ac_file" |
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -10141,7 +9898,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10162,17 +9919,17 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10210,15 +9967,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
+case `sed -n '/datarootdir/ {
p
q
}
@@ -10227,14 +9988,13 @@ ac_sed_dataroot='
/@infodir@/p
/@localedir@/p
/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@ -10248,16 +10008,15 @@ _ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -10266,75 +10025,137 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
- esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
;;
:H)
#
# CONFIG_HEADER
#
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ rm -f $ac_file
+ mv "$tmp/config.h" $ac_file
fi
else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
+ echo "/* $configure_input */"
+ cat "$ac_result"
fi
-# Compute "$ac_file"'s index in $config_headers.
+ rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- "$ac_file" | "$ac_file":* )
+ $ac_file | $ac_file:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10354,8 +10175,8 @@ $as_echo X"$ac_file" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -10369,14 +10190,15 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10420,7 +10242,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
+echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10446,7 +10268,7 @@ $as_echo X"$file" |
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -10455,7 +10277,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -10476,8 +10298,8 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
@@ -10494,11 +10316,6 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
-test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -10520,8 +10337,4 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
diff --git a/Build/source/texk/lcdf-typetools/configure.in b/Build/source/texk/lcdf-typetools/configure.in
index 8161453d62d..520f88ba90e 100644
--- a/Build/source/texk/lcdf-typetools/configure.in
+++ b/Build/source/texk/lcdf-typetools/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(NEWS)
-AM_INIT_AUTOMAKE(lcdf-typetools, 2.66)
+AM_INIT_AUTOMAKE(lcdf-typetools, 2.67)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff --git a/Build/source/texk/lcdf-typetools/depcomp b/Build/source/texk/lcdf-typetools/depcomp
index 04701da536f..ca5ea4e1ef9 100755
--- a/Build/source/texk/lcdf-typetools/depcomp
+++ b/Build/source/texk/lcdf-typetools/depcomp
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
# 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
@@ -91,7 +92,20 @@ gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -276,6 +290,46 @@ icc)
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@ tru64)
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
+ # static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
+ # compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff --git a/Build/source/texk/lcdf-typetools/glyphlist.txt b/Build/source/texk/lcdf-typetools/glyphlist.txt
index a1a22702a8e..0304ffc6674 100644
--- a/Build/source/texk/lcdf-typetools/glyphlist.txt
+++ b/Build/source/texk/lcdf-typetools/glyphlist.txt
@@ -1,3 +1,34 @@
+# ###################################################################################
+# Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this documentation file to use, copy, publish, distribute,
+# sublicense, and/or sell copies of the documentation, and to permit
+# others to do the same, provided that:
+# - No modification, editing or other alteration of this document is
+# allowed; and
+# - The above copyright notice and this permission notice shall be
+# included in all copies of the documentation.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this documentation file, to create their own derivative works
+# from the content of this document to use, copy, publish, distribute,
+# sublicense, and/or sell the derivative works, and to permit others to do
+# the same, provided that the derived work is not represented as being a
+# copy or version of this document.
+#
+# Adobe shall not be liable to any party for any loss of revenue or profit
+# or for indirect, incidental, special, consequential, or other similar
+# damages, whether based on tort (including without limitation negligence
+# or strict liability), contract or other legal or equitable grounds even
+# if Adobe has been advised or had reason to know of the possibility of
+# such damages.Ê The Adobe materials are provided on an "AS IS" basis.Ê
+# Adobe specifically disclaims all express, statutory, or implied
+# warranties relating to the Adobe materials, including but not limited to
+# those concerning merchantability or fitness for a particular purpose or
+# non-infringement of any third party rights regarding the Adobe
+# materials.
+# ###################################################################################
# Name: Adobe Glyph List
# Table version: 2.0
# Date: September 20, 2002
diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
index 2126aacbf9c..5006d350905 100644
--- a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
+++ b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h
@@ -8,7 +8,7 @@ extern "C" {
/* clp.h - Public interface to CLP.
* This file is part of CLP, the command line parser package.
*
- * Copyright (c) 1997-2005 Eddie Kohler, kohler@icir.org
+ * Copyright (c) 1997-2008 Eddie Kohler, ekohler@gmail.com
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -21,55 +21,156 @@ extern "C" {
* notice is a summary of the Click LICENSE file; the license in that file is
* legally binding. */
-
-/* Argument types */
-#define Clp_NoArg 0
-#define Clp_ArgString 1
-#define Clp_ArgStringNotOption 2
-#define Clp_ArgBool 3
-#define Clp_ArgInt 4
-#define Clp_ArgUnsigned 5
-#define Clp_ArgDouble 6
-
-#define Clp_FirstUserType 10
-
-/* Flags for individual Clp_Options */
-#define Clp_Mandatory (1<<0) /* Has mandatory argument */
-#define Clp_Optional (1<<1) /* Has optional argument */
-#define Clp_Negate (1<<2) /* Allow --no-OPT */
-#define Clp_OnlyNegated (1<<3) /* Allow --no-OPT, but not --OPT */
-#define Clp_PreferredMatch (1<<4) /* Prefer --OPT to --OPTwhatever */
- /* when matching option prefixes */
-
-struct Clp_Option {
- const char *long_name; /* e.g. "version" */
- int short_name; /* e.g. 'v' */
- int option_id; /* number returned by Clp_Next */
- int arg_type; /* e.g. Clp_ArgBool */
- int flags; /* e.g. Clp_Optional | Clp_Negate */
-};
-
-
-/* Sizes of clp->val */
-#define Clp_ValSize 40
-#define Clp_ValIntSize 10
-
typedef struct Clp_Option Clp_Option;
typedef struct Clp_Parser Clp_Parser;
-typedef struct Clp_Internal Clp_Internal;
typedef struct Clp_ParserState Clp_ParserState;
-typedef struct Clp_Argv Clp_Argv;
-typedef int (*Clp_ArgParseFunc)(Clp_Parser *, const char *, int, void *);
-typedef void (*Clp_ErrorHandler)(const char *);
+/** @brief Option description.
+ *
+ * CLP users declare arrays of Clp_Option structures to specify what options
+ * should be parsed.
+ * @sa Clp_NewParser, Clp_SetOptions */
+struct Clp_Option {
+ const char *long_name; /**< Name of long option, or NULL if the option
+ has no long name. */
+ int short_name; /**< Character defining short option, or 0 if
+ the option has no short name. */
+ int option_id; /**< User-specified ID defining option,
+ returned by Clp_Next. */
+ int val_type; /**< ID of option's value type, or 0 if option
+ takes no value. */
+ int flags; /**< Option parsing flags. */
+};
+
+/** @name Value types
+ * These values describe the type of an option's argument and are used in
+ * the Clp_Option val_type field. For example, if an option took integers, its
+ * Clp_Option structure would have val_type set to Clp_ValInt. */
+/**@{*/
+#define Clp_NoVal 0 /**< @brief Option takes no value. */
+#define Clp_ValString 1 /**< @brief Option value is an
+ arbitrary string. */
+#define Clp_ValStringNotOption 2 /**< @brief Option value is a
+ non-option string.
+
+ See Clp_DisallowOptions. */
+#define Clp_ValBool 3 /**< @brief Option value is a
+ boolean.
+
+ Accepts "true", "false", "yes", "no", "1", and "0", or any
+ prefixes thereof. The match is case-insensitive. */
+#define Clp_ValInt 4 /**< @brief Option value is a
+ signed int.
+
+ Accepts an optional "+" or "-" sign, followed by one or more
+ digits. The digits may be include a "0x" or "0X" prefix, for
+ a hexidecimal number, or a "0" prefix, for an octal number;
+ otherwise it is decimal. */
+#define Clp_ValUnsigned 5 /**< @brief Option value is an
+ unsigned int.
+
+ Accepts an optional "+" sign, followed by one or more
+ digits. The digits may be include a "0x" or "0X" prefix, for
+ a hexidecimal number, or a "0" prefix, for an octal number;
+ otherwise it is decimal. */
+#define Clp_ValDouble 6 /**< @brief Option value is a
+ double.
+ Accepts a real number as defined by strtod(). */
+#define Clp_ValFirstUser 10 /**< @brief Value types >=
+ Clp_ValFirstUser are available
+ for user types. */
+/**@}*/
+
+/** @name Option flags
+ * These flags are used in the Clp_Option flags field. */
+/**@{*/
+#define Clp_Mandatory (1<<0) /**< @brief Option flag: value
+ is mandatory.
+
+ It is an error if the option has no value. This is the
+ default if an option has arg_type != 0 and the Clp_Optional
+ flag is not provided. */
+#define Clp_Optional (1<<1) /**< @brief Option flag: value
+ is optional. */
+#define Clp_Negate (1<<2) /**< @brief Option flag: option
+ may be negated.
+
+ --no-[long_name] will be accepted in argument lists. */
+#define Clp_OnlyNegated (1<<3) /**< @brief Option flag: option
+ <em>must</em> be negated.
+
+ --no-[long_name] will be accepted in argument lists, but
+ --[long_name] will not. This is the default if long_name
+ begins with "no-". */
+#define Clp_PreferredMatch (1<<4) /**< @brief Option flag: prefer this
+ option when matching.
+
+ Prefixes of --[long_name] should map to this option, even if
+ other options begin with --[long_name]. */
+/**@}*/
+
+/** @name Option character types
+ * These flags are used in to define character types in Clp_SetOptionChar(). */
+/**@{*/
+/* Clp_NotOption 0 */
+#define Clp_Short (1<<0) /**< @brief Option character begins
+ a set of short options. */
+#define Clp_Long (1<<1) /**< @brief Option character begins
+ a long option. */
+#define Clp_ShortNegated (1<<2) /**< @brief Option character begins
+ a set of negated short options. */
+#define Clp_LongNegated (1<<3) /**< @brief Option character begins
+ a negated long option. */
+#define Clp_LongImplicit (1<<4) /**< @brief Option character can begin
+ a long option, and is part of that
+ long option. */
+/**@}*/
+
+#define Clp_NotOption 0 /**< @brief Clp_Next value: argument
+ was not an option. */
+#define Clp_Done -1 /**< @brief Clp_Next value: there are
+ no more arguments. */
+#define Clp_BadOption -2 /**< @brief Clp_Next value: argument
+ was an erroneous option. */
+#define Clp_Error -3 /**< @brief Clp_Next value: internal
+ CLP error. */
+
+#define Clp_ValSize 40 /**< @brief Minimum size of the
+ Clp_Parser val.cs field. */
+#define Clp_ValIntSize 10 /**< @brief Minimum size of the
+ Clp_Parser val.is field. */
+
+
+/** @brief A value parsing function.
+ * @param clp the parser
+ * @param vstr the value to be parsed
+ * @param complain if nonzero, report error messages via Clp_OptionError
+ * @param user_data user data passed to Clp_AddType()
+ * @return 1 if parsing succeeded, 0 otherwise
+ */
+typedef int (*Clp_ValParseFunc)(Clp_Parser *clp, const char *vstr,
+ int complain, void *user_data);
+
+/** @brief A function for reporting option errors.
+ * @param clp the parser
+ * @param message error message
+ */
+typedef void (*Clp_ErrorHandler)(Clp_Parser *clp, const char *message);
+
+
+/** @brief Command line parser.
+ *
+ * A Clp_Parser object defines an instance of CLP, including allowed options,
+ * value types, and current arguments.
+ * @sa Clp_NewParser, Clp_SetOptions, Clp_SetArguments */
struct Clp_Parser {
-
- int negated;
-
- int have_arg;
- const char *arg;
-
+ int negated; /**< Whether the last option was negated. */
+
+ int have_val; /**< Whether the last option had a value. */
+ const char *vstr; /**< The string value provided with the last
+ option. */
+
union {
int i;
unsigned u;
@@ -84,82 +185,102 @@ struct Clp_Parser {
unsigned char ucs[Clp_ValSize];
int is[Clp_ValIntSize];
unsigned us[Clp_ValIntSize];
- } val;
-
- Clp_Internal *internal;
-
+ } val; /**< The parsed value provided with the last
+ option. */
+
+ void *user_data; /**< Uninterpreted by CLP; users can set
+ arbitrarily. */
+
+ struct Clp_Internal *internal;
};
-Clp_Parser * Clp_NewParser(int argc, const char * const *argv,
- int nopt, Clp_Option *opt);
-void Clp_DeleteParser(Clp_Parser *);
+/** @brief Create a new Clp_Parser. */
+Clp_Parser *Clp_NewParser(int argc, const char * const *argv,
+ int nopt, const Clp_Option *opt);
-Clp_ErrorHandler Clp_SetErrorHandler(Clp_Parser *, Clp_ErrorHandler);
+/** @brief Destroy a Clp_Parser object. */
+void Clp_DeleteParser(Clp_Parser *clp);
-const char * Clp_ProgramName(Clp_Parser *);
-void Clp_SetProgramName(Clp_Parser *, const char *);
+/** @brief Return @a clp's program name. */
+const char *Clp_ProgramName(Clp_Parser *clp);
-struct Clp_Argv {
- int argc;
- char **argv;
- char *argv_buf;
-};
+/** @brief Set @a clp's program name. */
+const char *Clp_SetProgramName(Clp_Parser *clp, const char *name);
+
+
+/** @brief Set @a clp's error handler function. */
+Clp_ErrorHandler Clp_SetErrorHandler(Clp_Parser *clp, Clp_ErrorHandler errh);
+
+/** @brief Set @a clp's UTF-8 mode. */
+int Clp_SetUTF8(Clp_Parser *clp, int utf8);
+
+/** @brief Set @a clp's treatment of character @a c. */
+int Clp_SetOptionChar(Clp_Parser *clp, int c, int type);
-Clp_Argv * Clp_NewArgv(const char *args, int len);
-void Clp_DeleteArgv(Clp_Argv *);
+/** @brief Set @a clp's option definitions. */
+int Clp_SetOptions(Clp_Parser *clp, int nopt, const Clp_Option *opt);
+/** @brief Set @a clp's arguments. */
+void Clp_SetArguments(Clp_Parser *clp, int argc, const char * const *argv);
-/* Option types for Clp_SetOptionChar */
-/* Clp_NotOption 0 */
-#define Clp_Short (1<<0)
-#define Clp_Long (1<<1)
-#define Clp_ShortNegated (1<<2)
-#define Clp_LongNegated (1<<3)
-#define Clp_LongImplicit (1<<4)
+/** @brief Set whether @a clp is searching for options. */
+int Clp_SetOptionProcessing(Clp_Parser *clp, int on);
-int Clp_SetOptionChar(Clp_Parser *, int c, int option_type);
+#define Clp_DisallowOptions (1<<0) /**< @brief Value type flag: value
+ can't be an option string.
-/* Argument type flags for Clp_AddType */
-#define Clp_DisallowOptions (1<<0) /* No option-looking args */
+ See Clp_AddType(). */
-int Clp_AddType
- (Clp_Parser *, int type_id, int flags,
- Clp_ArgParseFunc func, void *user_data);
+/** @brief Define a new value type for @a clp. */
+int Clp_AddType(Clp_Parser *clp, int val_type, int flags,
+ Clp_ValParseFunc parser, void *user_data);
-/* Flags for Clp_AddStringListType */
-#define Clp_AllowNumbers (1<<0) /* Number args OK */
+#define Clp_AllowNumbers (1<<0) /**< @brief String list flag: allow
+ explicit numbers.
-int Clp_AddStringListType
- (Clp_Parser *, int type_id, int flags, ...);
-int Clp_AddStringListTypeVec
- (Clp_Parser *, int type_id, int flags,
- int n, char **str, int *val);
+ See Clp_AddStringListType() and Clp_AddStringListTypeVec(). */
+/** @brief Define a new string list value type for @a clp. */
+int Clp_AddStringListTypeVec(Clp_Parser *clp, int val_type, int flags,
+ int nstrs, const char * const *strs,
+ const int *vals);
-/* Return values from Clp_Next */
-#define Clp_NotOption 0
-#define Clp_Done -1
-#define Clp_BadOption -2
-#define Clp_Error -3
+/** @brief Define a new string list value type for @a clp. */
+int Clp_AddStringListType(Clp_Parser *clp, int val_type, int flags, ...);
-int Clp_Next(Clp_Parser *);
+/** @brief Parse and return the next argument from @a clp. */
+int Clp_Next(Clp_Parser *clp);
-const char * Clp_Shift(Clp_Parser *, int allow_dashes);
-int Clp_SetOptionProcessing(Clp_Parser *, int option_processing);
+/** @brief Return the next argument from @a clp without option parsing. */
+const char *Clp_Shift(Clp_Parser *clp, int allow_options);
+
+/** @brief Create a new Clp_ParserState. */
Clp_ParserState *Clp_NewParserState(void);
-void Clp_DeleteParserState(Clp_ParserState *);
-void Clp_SaveParser(Clp_Parser *, Clp_ParserState *);
-void Clp_RestoreParser(Clp_Parser *, Clp_ParserState *);
-int Clp_OptionError(Clp_Parser *, const char *, ...);
-int Clp_CurOptionNameBuf(Clp_Parser *, char *buf, int buflen);
-const char * Clp_CurOptionName(Clp_Parser *); /* uses static memory */
+/** @brief Destroy a Clp_ParserState object. */
+void Clp_DeleteParserState(Clp_ParserState *state);
+
+/** @brief Save @a clp's current state in @a state. */
+void Clp_SaveParser(const Clp_Parser *clp, Clp_ParserState *state);
+
+/** @brief Restore parser state from @a state into @a clp. */
+void Clp_RestoreParser(Clp_Parser *clp, const Clp_ParserState *state);
+
+
+/** @brief Report a parser error. */
+int Clp_OptionError(Clp_Parser *clp, const char *format, ...);
+
+/** @brief Extract the current option as a string. */
+int Clp_CurOptionNameBuf(Clp_Parser *clp, char *buf, int len);
+
+/** @brief Extract the current option as a string. */
+const char *Clp_CurOptionName(Clp_Parser *clp);
#ifdef __cplusplus
}
diff --git a/Build/source/texk/lcdf-typetools/install-sh b/Build/source/texk/lcdf-typetools/install-sh
index 4d4a9519eaf..4fbbae7b7ff 100755
--- a/Build/source/texk/lcdf-typetools/install-sh
+++ b/Build/source/texk/lcdf-typetools/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
@@ -95,7 +110,7 @@ Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test -n "$1"; do
+while test $# -ne 0; do
case $1 in
-c) shift
continue;;
@@ -111,9 +126,15 @@ while test -n "$1"; do
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
+ -m) mode=$2
shift
shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
continue;;
-o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@ while test -n "$1"; do
--version) echo "$0 $scriptversion"; exit $?;;
- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
+ --) shift
break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
esac
done
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
+fi
+
+if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -164,6 +193,33 @@ if test -z "$1"; then
exit 0
fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
for src
do
# Protect names starting with `-'.
@@ -173,15 +229,11 @@ do
if test -n "$dir_arg"; then
dst=$src
- src=
-
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
else
+
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@ do
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
fi
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
- # Make sure that the destination directory exists.
-
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
-
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
- pathcomp=
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
+ $posix_glob && set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
- pathcomp=$pathcomp/
- done
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@ do
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -276,10 +462,10 @@ do
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@ do
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|| {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
@@ -304,16 +491,13 @@ do
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ $doit $mvcmd "$dsttmp" "$dst"
}
- }
- fi || { (exit 1); exit 1; }
-done
+ } || exit 1
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
+ trap '' 0
+ fi
+done
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
index b3f2c2ae824..d527794de59 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec
@@ -1,7 +1,6 @@
Summary: Programs to manipulate OpenType and multiple-master fonts
Name: lcdf-typetools
-Version: 2.40
-Release: hmcmath.1
+Version: 2.67
Copyright: GPL
Vendor: Little Cambridgeport Design Factory <http://www.lcdf.org/>
Group: Utilities/Printing
@@ -34,6 +33,9 @@ This package contains four tools for working with OpenType fonts:
t1testpage creates a PostScript test page for a specified
font file (preliminary)
+ ttftotype42 creates a Type 42 wrapper for a TrueType or TrueType-flavored
+ OpenType font.
+
The package now includes programs for working with multiple-master
fonts formerly distributed as mminstance. These tools allow you to
use multiple-master fonts with programs that require single-master
@@ -84,10 +86,14 @@ make DESTDIR=$RPM_BUILD_ROOT install
%{_bindir}/t1lint
%{_bindir}/t1reencode
%{_bindir}/t1testpage
+%{_bindir}/ttftotype42
%{_mandir}/man*/*
%{_datadir}/lcdf-typetools/*
%changelog
+* Fri Aug 3 2007 Eddie Kohler <kohler@cs.ucla.edu>
+- Updates.
+
* Wed Sep 8 2004 Claire Connelly <cmc@math.hmc.edu> - 2.12-hmcmath.1
- Initial packaging.
diff --git a/Build/source/texk/lcdf-typetools/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
index ade4c16d4ab..17cb8d67ab5 100644
--- a/Build/source/texk/lcdf-typetools/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -60,7 +56,7 @@ am_libefont_a_OBJECTS = afm.$(OBJEXT) afmparse.$(OBJEXT) \
t1rw.$(OBJEXT) t1unparser.$(OBJEXT) ttfcs.$(OBJEXT) \
ttfhead.$(OBJEXT)
libefont_a_OBJECTS = $(am_libefont_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -74,8 +70,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,6 +93,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -111,9 +107,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -129,14 +124,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -144,24 +137,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libefont.a
libefont_a_SOURCES = \
@@ -280,19 +284,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttfhead.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -343,22 +346,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -420,12 +422,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -445,18 +455,22 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-noinstLIBRARIES ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am 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-am uninstall-info-am
+ uninstall-am
srclinks:
diff --git a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
index 319c4176e9e..06dfa548916 100644
--- a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc
@@ -346,10 +346,10 @@ PermString
AfmParser::keyword() const
{
const char *f = (const char *)_pos;
- while (isspace(*f))
+ while (isspace((unsigned char) *f))
f++;
const char *l = f;
- while (isalnum(*l) || *l == '_')
+ while (isalnum((unsigned char) *l) || *l == '_')
l++;
return PermString(f, l - f);
}
diff --git a/Build/source/texk/lcdf-typetools/libefont/cff.cc b/Build/source/texk/lcdf-typetools/libefont/cff.cc
index c17ad9d6a97..d654b4fea93 100644
--- a/Build/source/texk/lcdf-typetools/libefont/cff.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/cff.cc
@@ -1594,7 +1594,7 @@ Cff::CIDFont::glyph(int gid) const
int
Cff::CIDFont::glyphid(PermString name) const
{
- if (name.length() <= 1 || name[0] != '#' || !isdigit(name[1]))
+ if (name.length() <= 1 || name[0] != '#' || !isdigit((unsigned char) name[1]))
return -1;
char *endptr;
long cid = strtol(name.c_str() + 1, &endptr, 10);
diff --git a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
index c993af1ce4d..9b688bb527f 100644
--- a/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/otfgsub.cc
@@ -646,31 +646,43 @@ GsubLookup::unparse_automatics(const Gsub &gsub, Vector<Substitution> &v) const
int nlookup = _d.u16(4);
switch (_type) {
case L_SINGLE:
- for (int i = 0; i < nlookup; i++)
- GsubSingle(subtable(i)).unparse(v);
+ for (int i = 0; i < nlookup; i++) {
+ GsubSingle x(subtable(i)); // this pattern makes gcc-3.3.4 happier
+ x.unparse(v);
+ }
return true;
case L_MULTIPLE:
- for (int i = 0; i < nlookup; i++)
- GsubMultiple(subtable(i)).unparse(v);
+ for (int i = 0; i < nlookup; i++) {
+ GsubMultiple x(subtable(i));
+ x.unparse(v);
+ }
return true;
case L_ALTERNATE:
- for (int i = 0; i < nlookup; i++)
- GsubMultiple(subtable(i)).unparse(v, true);
+ for (int i = 0; i < nlookup; i++) {
+ GsubMultiple x(subtable(i));
+ x.unparse(v, true);
+ }
return true;
case L_LIGATURE:
- for (int i = 0; i < nlookup; i++)
- GsubLigature(subtable(i)).unparse(v);
+ for (int i = 0; i < nlookup; i++) {
+ GsubLigature x(subtable(i));
+ x.unparse(v);
+ }
return true;
case L_CONTEXT: {
bool understood = true;
- for (int i = 0; i < nlookup; i++)
- understood &= GsubContext(subtable(i)).unparse(gsub, v);
+ for (int i = 0; i < nlookup; i++) {
+ GsubContext x(subtable(i));
+ understood &= x.unparse(gsub, v);
+ }
return understood;
}
case L_CHAIN: {
bool understood = true;
- for (int i = 0; i < nlookup; i++)
- understood &= GsubChainContext(subtable(i)).unparse(gsub, v);
+ for (int i = 0; i < nlookup; i++) {
+ GsubChainContext x(subtable(i));
+ understood &= x.unparse(gsub, v);
+ }
return understood;
}
default:
@@ -684,24 +696,32 @@ GsubLookup::apply(const Glyph *g, int pos, int n, Substitution &s) const
int nlookup = _d.u16(4);
switch (_type) {
case L_SINGLE:
- for (int i = 0; i < nlookup; i++)
- if (GsubSingle(subtable(i)).apply(g, pos, n, s))
+ for (int i = 0; i < nlookup; i++) {
+ GsubSingle x(subtable(i));
+ if (x.apply(g, pos, n, s))
return true;
+ }
return false;
case L_MULTIPLE:
- for (int i = 0; i < nlookup; i++)
- if (GsubMultiple(subtable(i)).apply(g, pos, n, s))
+ for (int i = 0; i < nlookup; i++) {
+ GsubMultiple x(subtable(i));
+ if (x.apply(g, pos, n, s))
return true;
+ }
return false;
case L_ALTERNATE:
- for (int i = 0; i < nlookup; i++)
- if (GsubMultiple(subtable(i)).apply(g, pos, n, s, true))
+ for (int i = 0; i < nlookup; i++) {
+ GsubMultiple x(subtable(i));
+ if (x.apply(g, pos, n, s, true))
return true;
+ }
return false;
case L_LIGATURE:
- for (int i = 0; i < nlookup; i++)
- if (GsubLigature(subtable(i)).apply(g, pos, n, s))
+ for (int i = 0; i < nlookup; i++) {
+ GsubLigature x(subtable(i));
+ if (x.apply(g, pos, n, s))
return true;
+ }
return false;
default: // XXX
return false;
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1font.cc b/Build/source/texk/lcdf-typetools/libefont/t1font.cc
index 068002db58f..8dd504e2c61 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1font.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1font.cc
@@ -263,10 +263,10 @@ Type1Font::read(Type1Reader &reader)
add_item(new Type1CopyItem(s));
x = s.data();
- if (eexec_state == 0 && strncmp(x, "currentfile eexec", 17) == 0 && (isspace(x[17]) || !x[17])) {
+ if (eexec_state == 0 && strncmp(x, "currentfile eexec", 17) == 0 && (isspace((unsigned char) x[17]) || !x[17])) {
// allow arbitrary whitespace after "currentfile eexec".
// note: strlen("currentfile eexec") == 17
- for (x += 17; isspace(*x); x++)
+ for (x += 17; isspace((unsigned char) *x); x++)
/* nada */;
reader.switch_eexec(true, (unsigned char *)x, (s.data() + s.length()) - x);
set_item(nitems() - 1, new Type1EexecItem(true));
@@ -315,7 +315,7 @@ Type1Font::ok() const
void
Type1Font::read_encoding(Type1Reader &reader, const char *first_line)
{
- while (isspace(*first_line))
+ while (isspace((unsigned char) *first_line))
first_line++;
if (strncmp(first_line, "StandardEncoding", 16) == 0) {
add_type1_encoding(Type1Encoding::standard_encoding());
@@ -346,9 +346,9 @@ Type1Font::read_encoding(Type1Reader &reader, const char *first_line)
// parse as many `dup INDEX */CHARNAME put' as there are in the line
while (1) {
// skip spaces, look for `dup '
- while (isspace(pos[0]))
+ while (isspace((unsigned char) pos[0]))
pos++;
- if (pos[0] != 'd' || pos[1] != 'u' || pos[2] != 'p' || !isspace(pos[3]))
+ if (pos[0] != 'd' || pos[1] != 'u' || pos[2] != 'p' || !isspace((unsigned char) pos[3]))
break;
// look for `INDEX */'
@@ -400,7 +400,7 @@ read_synthetic_string(Type1Reader &reader, StringAccum &wrong_accum,
sscanf(accum.data(), format, value, &n);
else
sscanf(accum.data(), format, &n);
- return (n != 0 && (isspace(accum[n]) || accum[n] == '\0'));
+ return (n != 0 && (isspace((unsigned char) accum[n]) || accum[n] == '\0'));
}
bool
@@ -413,7 +413,7 @@ Type1Font::read_synthetic_font(Type1Reader &reader, const char *first_line,
char *x = new char[strlen(first_line) + 1];
int n = 0;
sscanf(first_line, "FontDirectory /%[^] \t\r\n[{}/] known {%n", x, &n);
- if (n && (isspace(first_line[n]) || first_line[n] == 0))
+ if (n && (isspace((unsigned char) first_line[n]) || first_line[n] == 0))
font_name = x;
delete[] x;
if (!font_name)
@@ -734,8 +734,8 @@ Type1Font::get_dict_size(int d) const
} else if (Type1CopyItem *copy = item->cast_copy()) {
String value = copy->value();
int pos = value.find_left(" dict");
- if (pos >= 1 && isdigit(value[pos - 1])) {
- while (pos >= 1 && isdigit(value[pos - 1]))
+ if (pos >= 1 && isdigit((unsigned char) value[pos - 1])) {
+ while (pos >= 1 && isdigit((unsigned char) value[pos - 1]))
pos--;
return strtol(value.data() + pos, 0, 10);
}
@@ -756,9 +756,9 @@ Type1Font::set_dict_size(int d, int size)
} else if (Type1CopyItem *copy = item->cast_copy()) {
String value = copy->value();
int pos = value.find_left(" dict");
- if (pos >= 1 && isdigit(value[pos - 1])) {
+ if (pos >= 1 && isdigit((unsigned char) value[pos - 1])) {
int numpos = pos - 1;
- while (numpos >= 1 && isdigit(value[numpos - 1]))
+ while (numpos >= 1 && isdigit((unsigned char) value[numpos - 1]))
numpos--;
StringAccum accum;
accum << value.substring(0, numpos) << size << value.substring(pos);
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/libefont/t1item.cc
index ee71a3af92d..3fb71edb1ad 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1item.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1item.cc
@@ -149,7 +149,7 @@ Type1Definition::make(StringAccum &accum, Type1Reader *reader,
bool force_definition)
{
char *s = accum.data();
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
if (*s != '/')
return 0;
@@ -157,14 +157,14 @@ Type1Definition::make(StringAccum &accum, Type1Reader *reader,
int name_start_pos = s - accum.data();
// find NAME LENGTH
- while (!isspace(*s) && *s != '[' && *s != '{' && *s != '('
+ while (!isspace((unsigned char) *s) && *s != '[' && *s != '{' && *s != '('
&& *s != ']' && *s != '}' && *s != ')' && *s)
s++;
if (!*s)
return 0;
int name_end_pos = s - accum.data();
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
int val_pos = s - accum.data();
int val_end_pos = -1;
@@ -191,7 +191,7 @@ Type1Definition::make(StringAccum &accum, Type1Reader *reader,
val_end_pos = s - accum.data();
} else {
- while (!isspace(*s) && *s)
+ while (!isspace((unsigned char) *s) && *s)
s++;
val_end_pos = s - accum.data();
if (!force_definition) check_def = true;
@@ -200,7 +200,7 @@ Type1Definition::make(StringAccum &accum, Type1Reader *reader,
if (val_end_pos < 0)
return 0;
s = accum.data() + val_end_pos;
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
if (check_def && (s[0] != 'd' || s[1] != 'e' || s[2] != 'f'))
if (strncmp(s, "dict def", 8) != 0)
@@ -321,7 +321,7 @@ Type1Definition::value_name(PermString &str) const
return false;
int pos;
for (pos = 1; pos < _val.length(); pos++)
- if (isspace(_val[pos]) || _val[pos] == '/')
+ if (isspace((unsigned char) _val[pos]) || _val[pos] == '/')
return false;
str = PermString(_val.data() + 1, pos - 1);
return true;
@@ -336,9 +336,9 @@ strtonumvec(const char *f, const char **endf, NumVector &v)
return false;
s++;
while (1) {
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
- if (isdigit(*s) || *s == '.' || *s == '-')
+ if (isdigit((unsigned char) *s) || *s == '.' || *s == '-')
v.push_back( strtonumber(s, &s) );
else {
if (endf)
@@ -363,7 +363,7 @@ strtonumvec_vec(const char *f, const char **endf, Vector<NumVector> &v)
return false;
s++;
while (1) {
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
if (*s == '[' || *s == '{') {
NumVector subv;
@@ -394,7 +394,7 @@ Type1Definition::value_normalize(Vector<NumVector> &in,
if (*s++ != '[')
return false;
while (1) {
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
if (*s == '[') {
Vector<NumVector> sub;
@@ -424,13 +424,13 @@ Type1Definition::value_namevec(Vector<PermString> &v) const
if (*s++ != '[')
return false;
while (1) {
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
if (*s == '/')
s++;
- if (isalnum(*s)) {
+ if (isalnum((unsigned char) *s)) {
const char *start = s;
- while (*s && !isspace(*s) && *s != ']' && *s != '/')
+ while (*s && !isspace((unsigned char) *s) && *s != ']' && *s != '/')
s++;
v.push_back(PermString(start, s - start));
} else
@@ -466,7 +466,7 @@ Type1Definition::set_string(const String &v)
StringAccum sa;
sa << '(';
for (int pos = 0; pos < len; pos++)
- if ((s[pos] < ' ' && !isspace(s[pos])) || ((unsigned char)s[pos]) > 0176 || s[pos] == '(' || s[pos] == ')' || s[pos] == '\\') {
+ if ((s[pos] < ' ' && !isspace((unsigned char) s[pos])) || ((unsigned char)s[pos]) > 0176 || s[pos] == '(' || s[pos] == ')' || s[pos] == '\\') {
sa << v.substring(left, pos - left) << '\\';
if (s[pos] == '(' || s[pos] == ')' || s[pos] == '\\')
sa << s[pos];
@@ -673,14 +673,14 @@ Type1Subr::make(const char *s_in, int s_len, int cs_pos, int cs_len, int lenIV)
// Force literal spaces rather than isspace().
if (*s == '/') {
const char *nstart = ++s;
- while (!isspace(*s) && *s)
+ while (!isspace((unsigned char) *s) && *s)
s++;
name = PermString(nstart, s - nstart);
} else {
// dup [subrno] ...
s += 3;
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
subrno = strtol(s, (char **)&s, 10);
}
@@ -773,9 +773,9 @@ Type1SubrGroupItem::gen(Type1Writer &w)
Type1Font *font = _font;
int pos = _value.find_left(_is_subrs ? " array" : " dict");
- if (pos >= 1 && isdigit(_value[pos - 1])) {
+ if (pos >= 1 && isdigit((unsigned char) _value[pos - 1])) {
int numpos = pos - 1;
- while (numpos >= 1 && isdigit(_value[numpos - 1]))
+ while (numpos >= 1 && isdigit((unsigned char) _value[numpos - 1]))
numpos--;
int n;
diff --git a/Build/source/texk/lcdf-typetools/libefont/t1rw.cc b/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
index 152084c8ec4..593b6266630 100644
--- a/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
+++ b/Build/source/texk/lcdf-typetools/libefont/t1rw.cc
@@ -216,10 +216,10 @@ Type1Reader::test_charstring(StringAccum &str)
if (s[0] == '/')
s++;
- else if (s[0] == 'd' && s[1] == 'u' && s[2] == 'p' && isspace(s[3])) {
+ else if (s[0] == 'd' && s[1] == 'u' && s[2] == 'p' && isspace((unsigned char) s[3])) {
s += 4;
// 17.Jan.2000 -- some fonts have extra space here.
- while (isspace(*s))
+ while (isspace((unsigned char) *s))
s++;
} else
goto not_charstring;
@@ -228,7 +228,7 @@ Type1Reader::test_charstring(StringAccum &str)
// Why? Consistency: we force 1 literal space around _charstring_definer.
while (*s != ' ' && *s)
s++;
- if (*s++ != ' ' || !isdigit(*s))
+ if (*s++ != ' ' || !isdigit((unsigned char) *s))
goto not_charstring;
start = s;
s++;
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
index 0e46cb1c67c..5c974fd93dd 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -53,7 +49,7 @@ am_liblcdf_a_OBJECTS = bezier.$(OBJEXT) clp.$(OBJEXT) error.$(OBJEXT) \
slurper.$(OBJEXT) straccum.$(OBJEXT) string.$(OBJEXT) \
strtonum.$(OBJEXT) transform.$(OBJEXT) vectorv.$(OBJEXT)
liblcdf_a_OBJECTS = $(am_liblcdf_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -71,8 +67,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -96,6 +90,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,9 +104,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -126,14 +121,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -141,24 +134,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = liblcdf.a
liblcdf_a_SOURCES = bezier.cc \
@@ -246,33 +250,32 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectorv.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -323,22 +326,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -400,12 +402,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -425,18 +435,22 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-noinstLIBRARIES ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am 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-am uninstall-info-am
+ uninstall-am
srclinks:
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
index aa99f34f40e..aa0a0bdd559 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
@@ -2,7 +2,7 @@
/* clp.c - Complete source code for CLP.
* This file is part of CLP, the command line parser package.
*
- * Copyright (c) 1997-2006 Eddie Kohler, kohler@cs.ucla.edu
+ * Copyright (c) 1997-2008 Eddie Kohler, ekohler@gmail.com
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -35,236 +35,512 @@
extern "C" {
#endif
+
+/** @file clp.h
+ * @brief Functions for parsing command line options.
+ *
+ * The CLP functions are used to parse command line arugments into options.
+ * It automatically handles value parsing, error messages, long options with
+ * minimum prefix matching, short options, and negated options.
+ *
+ * The CLP model works like this.
+ *
+ * <ol>
+ * <li>The user declares an array of Clp_Option structures that define the
+ * options their program accepts.</li>
+ * <li>The user creates a Clp_Parser object using Clp_NewParser(), passing in
+ * the command line arguments to parse and the Clp_Option structures.</li>
+ * <li>A loop repeatedly calls Clp_Next() to parse the arguments.</li>
+ * </ol>
+ *
+ * Unlike many command line parsing libraries, CLP steps through all arguments
+ * one at a time, rather than slurping up all options at once. This makes it
+ * meaningful to give an option more than once.
+ *
+ * Here's an example.
+ *
+ * @code
+ * #define ANIMAL_OPT 1
+ * #define VEGETABLE_OPT 2
+ * #define MINERALS_OPT 3
+ * #define USAGE_OPT 4
+ *
+ * static const Clp_Option options[] = {
+ * { "animal", 'a', ANIMAL_OPT, Clp_ValString, 0 },
+ * { "vegetable", 'v', VEGETABLE_OPT, Clp_ValString, Clp_Negate | Clp_Optional },
+ * { "minerals", 'm', MINERALS_OPT, Clp_ValInt, 0 },
+ * { "usage", 0, USAGE_OPT, 0, 0 }
+ * };
+ *
+ * int main(int argc, char *argv[]) {
+ * Clp_Parser *clp = Clp_NewParser(argc, argv,
+ * sizeof(options) / sizeof(options[0]), options);
+ * int opt;
+ * while ((opt = Clp_Next(clp)) != Clp_Done)
+ * switch (opt) {
+ * case ANIMAL_OPT:
+ * fprintf(stderr, "animal is %s\n", clp->val.s);
+ * break;
+ * case VEGETABLE_OPT:
+ * if (clp->negated)
+ * fprintf(stderr, "no vegetables!\n");
+ * else if (clp->have_val)
+ * fprintf(stderr, "vegetable is %s\n", clp->val.s);
+ * else
+ * fprintf(stderr, "vegetables OK\n");
+ * break;
+ * case MINERALS_OPT:
+ * fprintf(stderr, "%d minerals\n", clp->val.i);
+ * break;
+ * case USAGE_OPT:
+ * fprintf(stderr, "Usage: 20q [--animal=ANIMAL] [--vegetable[=VEGETABLE]] [--minerals=N]\n");
+ * break;
+ * case Clp_NotOption:
+ * fprintf(stderr, "non-option %s\n", clp->vstr);
+ * break;
+ * }
+ * }
+ * }
+ * @endcode
+ *
+ * Here are a couple of executions.
+ *
+ * <pre>
+ * % ./20q --animal=cat
+ * animal is cat
+ * % ./20q --animal=cat -a dog -afish --animal bird --an=snake
+ * animal is cat
+ * animal is dog
+ * animal is fish
+ * animal is bird
+ * animal is snake
+ * % ./20q --no-vegetables
+ * no vegetables!
+ * % ./20q -v
+ * vegetables OK
+ * % ./20q -vkale
+ * vegetable is kale
+ * % ./20q -m10
+ * 10 minerals
+ * % ./20q -m foo
+ * '-m' expects an integer, not 'foo'
+ * </pre>
+ */
+
+
/* Option types for Clp_SetOptionChar */
#define Clp_DoubledLong (Clp_LongImplicit * 2)
-#define Clp_AnyArgument (Clp_Mandatory | Clp_Optional)
-
+#define Clp_InitialValType 8
#define MAX_AMBIGUOUS_VALUES 4
typedef struct {
- Clp_ArgParseFunc func;
+ int val_type;
+ Clp_ValParseFunc func;
int flags;
- void *thunk;
-} Clp_ArgType;
-
+ void *user_data;
+} Clp_ValType;
typedef struct {
- int pos;
- int neg;
-} Clp_LongMinMatch;
-
+ unsigned ilong : 1;
+ unsigned ishort : 1;
+ unsigned imandatory : 1;
+ unsigned ioptional : 1;
+ unsigned ipos : 1;
+ unsigned ineg : 1;
+ unsigned iprefmatch : 1;
+ unsigned lmmpos_short : 1;
+ unsigned lmmneg_short : 1;
+ unsigned char ilongoff;
+ int lmmpos;
+ int lmmneg;
+} Clp_InternOption;
+
+
+#define Clp_OptionCharsSize 5
-struct Clp_Internal {
-
- Clp_Option *opt;
- Clp_LongMinMatch *long_min_match;
+typedef struct {
+ int c;
+ int type;
+} Clp_Oclass;
+#define Clp_OclassSize 10
+
+typedef struct Clp_Internal {
+ const Clp_Option *opt;
+ Clp_InternOption *iopt;
int nopt;
+ unsigned opt_generation;
- Clp_ArgType *argtype;
- int nargtype;
+ Clp_ValType *valtype;
+ int nvaltype;
const char * const *argv;
int argc;
+
+ Clp_Oclass oclass[Clp_OclassSize];
+ int noclass;
+ int long1pos;
+ int long1neg;
+ int utf8;
- unsigned char option_class[256];
- int both_short_and_long;
-
- char option_chars[3];
- const char *text;
+ char option_chars[Clp_OptionCharsSize];
+ const char *xtext;
const char *program_name;
- void (*error_handler)(const char *);
-
- int is_short;
- int whole_negated; /* true if negated by an option character */
- int could_be_short;
+ void (*error_handler)(Clp_Parser *, const char *);
int option_processing;
+ int current_option;
+
+ unsigned char is_short;
+ unsigned char whole_negated; /* true if negated by an option character */
+ unsigned char could_be_short;
+ unsigned char current_short;
+ unsigned char negated_by_no;
int ambiguous;
int ambiguous_values[MAX_AMBIGUOUS_VALUES];
-
- Clp_Option *current_option;
- int current_short;
- int negated_by_no;
-
-};
+} Clp_Internal;
struct Clp_ParserState {
const char * const *argv;
int argc;
- char option_chars[3];
- const char *text;
- int is_short;
- int whole_negated;
+
+ char option_chars[Clp_OptionCharsSize];
+ const char *xtext;
+
+ int option_processing;
+
+ unsigned opt_generation;
+ int current_option;
+ unsigned char is_short;
+ unsigned char whole_negated;
+ unsigned char current_short;
+ unsigned char negated_by_no;
};
typedef struct Clp_StringList {
+
Clp_Option *items;
- Clp_LongMinMatch *long_min_match;
+ Clp_InternOption *iopt;
int nitems;
+
int allow_int;
int nitems_invalid_report;
+
} Clp_StringList;
-#define TEST(o, f) (((o)->flags & (f)) != 0)
-
-
-static int calculate_long_min_match(int, Clp_Option *, int, int, int);
-
static int parse_string(Clp_Parser *, const char *, int, void *);
static int parse_int(Clp_Parser *, const char *, int, void *);
static int parse_bool(Clp_Parser *, const char *, int, void *);
static int parse_double(Clp_Parser *, const char *, int, void *);
static int parse_string_list(Clp_Parser *, const char *, int, void *);
-static int ambiguity_error(Clp_Parser *, int, int *, Clp_Option *,
- const char *, const char *, ...);
+static int ambiguity_error(Clp_Parser *, int, int *, const Clp_Option *,
+ const Clp_InternOption *, const char *, const char *,
+ ...);
+
+
+/*******
+ * utf8
+ **/
+
+#define U_REPLACEMENT 0xFFFD
+
+static char *
+encode_utf8(char *s, int n, int c)
+{
+ if (c < 0 || c >= 0x110000 || (c >= 0xD800 && c <= 0xDFFF))
+ c = U_REPLACEMENT;
+ if (c <= 0x7F && n >= 1)
+ *s++ = c;
+ else if (c <= 0x7FF && n >= 2) {
+ *s++ = 0xC0 | (c >> 6);
+ goto char1;
+ } else if (c <= 0xFFFF && n >= 3) {
+ *s++ = 0xE0 | (c >> 12);
+ goto char2;
+ } else if (n >= 4) {
+ *s++ = 0xF0 | (c >> 18);
+ *s++ = 0x80 | ((c >> 12) & 0x3F);
+ char2:
+ *s++ = 0x80 | ((c >> 6) & 0x3F);
+ char1:
+ *s++ = 0x80 | (c & 0x3F);
+ }
+ return s;
+}
+
+static int
+decode_utf8(const char *s, char **cp)
+{
+ int c;
+ if ((unsigned char) *s <= 0x7F) /* 1 byte: 0x000000-0x00007F */
+ c = *s++;
+ else if ((unsigned char) *s <= 0xC1) /* bad/overlong encoding */
+ goto replacement;
+ else if ((unsigned char) *s <= 0xDF) { /* 2 bytes: 0x000080-0x0007FF */
+ if ((s[1] & 0xC0) != 0x80) /* bad encoding */
+ goto replacement;
+ c = (*s++ & 0x1F) << 6;
+ goto char1;
+ } else if ((unsigned char) *s <= 0xEF) { /* 3 bytes: 0x000800-0x00FFFF */
+ if ((s[1] & 0xC0) != 0x80 /* bad encoding */
+ || (s[2] & 0xC0) != 0x80 /* bad encoding */
+ || ((unsigned char) *s == 0xE0 /* overlong encoding */
+ && (s[1] & 0xE0) == 0x80)
+ || ((unsigned char) *s == 0xED /* encoded surrogate */
+ && (s[1] & 0xE0) == 0xA0))
+ goto replacement;
+ c = (*s++ & 0x0F) << 12;
+ goto char2;
+ } else if ((unsigned char) *s <= 0xF4) { /* 4 bytes: 0x010000-0x10FFFF */
+ if ((s[1] & 0xC0) != 0x80 /* bad encoding */
+ || (s[2] & 0xC0) != 0x80 /* bad encoding */
+ || (s[3] & 0xC0) != 0x80 /* bad encoding */
+ || ((unsigned char) *s == 0xF0 /* overlong encoding */
+ && (s[1] & 0xF0) == 0x80)
+ || ((unsigned char) *s == 0xF4 /* encoded value > 0x10FFFF */
+ && (unsigned char) s[1] >= 0x90))
+ goto replacement;
+ c = (*s++ & 0x07) << 18;
+ c += (*s++ & 0x3F) << 12;
+ char2:
+ c += (*s++ & 0x3F) << 6;
+ char1:
+ c += (*s++ & 0x3F);
+ } else {
+ replacement:
+ c = U_REPLACEMENT;
+ for (s++; (*s & 0xC0) == 0x80; s++)
+ /* nothing */;
+ }
+ if (cp)
+ *cp = (char *) s;
+ return c;
+}
+
+static int
+utf8_charlen(const char *s)
+{
+ char *sout;
+ (void) decode_utf8(s, &sout);
+ return sout - s;
+}
+
+static int
+clp_utf8_charlen(const Clp_Internal *cli, const char *s)
+{
+ return (cli->utf8 ? utf8_charlen(s) : 1);
+}
/*******
* Clp_NewParser, etc.
**/
+static int
+min_different_chars(const char *s, const char *t)
+ /* Returns the minimum number of bytes required to distinguish
+ s from t.
+ If s is shorter than t, returns strlen(s). */
+{
+ const char *sfirst = s;
+ while (*s && *t && *s == *t)
+ s++, t++;
+ if (!*s)
+ return s - sfirst;
+ else
+ return s - sfirst + 1;
+}
+
+static int
+long_as_short(const Clp_Internal *cli, const Clp_Option *o,
+ Clp_InternOption *io, int failure)
+{
+ if ((cli->long1pos || cli->long1neg) && io->ilong) {
+ const char *name = o->long_name + io->ilongoff;
+ if (cli->utf8) {
+ int c = decode_utf8(name, (char **) &name);
+ if (!*name && c && c != U_REPLACEMENT)
+ return c;
+ } else if (name[0] && !name[1])
+ return (unsigned char) name[0];
+ }
+ return failure;
+}
+
static void
-check_duplicated_short_options(Clp_Parser *clp, int nopt, Clp_Option *opt, int negated)
+compare_options(Clp_Parser *clp, const Clp_Option *o1, Clp_InternOption *io1,
+ const Clp_Option *o2, Clp_InternOption *io2)
{
- int i;
- int check[256];
-
- for (i = 0; i < 256; i++)
- check[i] = -1;
-
- for (i = 0; i < nopt; i++)
- if (opt[i].short_name > 0 && opt[i].short_name < 256
- && (negated ? TEST(&opt[i], Clp_Negate)
- : !TEST(&opt[i], Clp_OnlyNegated))) {
- int sh = opt[i].short_name;
- if (check[sh] >= 0 && check[sh] != opt[i].option_id)
- Clp_OptionError(clp, "CLP internal error: more than 1 option has short name '%c'", sh);
- check[sh] = opt[i].option_id;
+ Clp_Internal *cli = clp->internal;
+
+ /* ignore meaningless combinations */
+ if ((!io1->ishort && !io1->ilong) || (!io2->ishort && !io2->ilong)
+ || !((io1->ipos && io2->ipos) || (io1->ineg && io2->ineg))
+ || o1->option_id == o2->option_id)
+ return;
+
+ /* look for duplication of short options */
+ int short1 = (io1->ishort ? o1->short_name : -1);
+ int shortx1 = long_as_short(cli, o1, io1, -2);
+ if (short1 >= 0 || shortx1 >= 0) {
+ int short2 = (io2->ishort ? o2->short_name : -3);
+ int shortx2 = long_as_short(cli, o2, io2, -4);
+ if (short1 == short2)
+ Clp_OptionError(clp, "CLP internal error: more than 1 option has short name %`%c%'", short1);
+ else if ((short1 == shortx2 || shortx1 == short2 || shortx1 == shortx2)
+ && ((io1->ipos && io2->ipos && cli->long1pos)
+ || (io1->ineg && io2->ineg && cli->long1neg)))
+ Clp_OptionError(clp, "CLP internal error: 1-char long name conflicts with short name %`%c%'", (short1 == shortx2 ? shortx2 : shortx1));
+ }
+
+ /* analyze longest minimum match */
+ if (io1->ilong) {
+ const char *name1 = o1->long_name + io1->ilongoff;
+
+ /* long name's first character matches short name */
+ if (io2->ishort && !io1->iprefmatch) {
+ int name1char = (cli->utf8 ? decode_utf8(name1, 0) : (unsigned char) *name1);
+ if (name1char == o2->short_name) {
+ if (io1->ipos && io2->ipos)
+ io1->lmmpos_short = 1;
+ if (io1->ineg && io2->ineg)
+ io1->lmmneg_short = 1;
+ }
}
+
+ /* match long name to long name */
+ if (io2->ilong) {
+ const char *name2 = o2->long_name + io2->ilongoff;
+ if (strcmp(name1, name2) == 0)
+ Clp_OptionError(clp, "CLP internal error: duplicate long name %`%s%'", name1);
+ if (io1->ipos && io2->ipos && !strncmp(name1, name2, io1->lmmpos)
+ && (!io1->iprefmatch || strncmp(name1, name2, strlen(name1))))
+ io1->lmmpos = min_different_chars(name1, name2);
+ if (io1->ineg && io2->ineg && !strncmp(name1, name2, io1->lmmneg)
+ && (!io1->iprefmatch || strncmp(name1, name2, strlen(name1))))
+ io1->lmmneg = min_different_chars(name1, name2);
+ }
+ }
}
+/** @param argc number of arguments
+ * @param argv argument array
+ * @param nopt number of option definitions
+ * @param opt option definition array
+ * @return the parser
+ *
+ * The new Clp_Parser that will parse the arguments in @a argv according to
+ * the option definitions in @a opt.
+ *
+ * The Clp_Parser is created with the following characteristics:
+ *
+ * <ul>
+ * <li>The "-" character introduces short options (<tt>Clp_SetOptionChar(clp,
+ * '-', Clp_Short)</tt>).</li>
+ * <li>Clp_ProgramName is set from the first argument in @a argv, if any. The
+ * first argument returned by Clp_Next() will be the second argument in @a
+ * argv. Note that this behavior differs from Clp_SetArguments.</li>
+ * <li>UTF-8 support is on iff the <tt>LANG</tt> environment variable contains
+ * one of the substrings "UTF-8", "UTF8", or "utf8".</li>
+ * <li>The Clp_ValString, Clp_ValStringNotOption, Clp_ValInt, Clp_ValUnsigned,
+ * Clp_ValBool, and Clp_ValDouble types are installed.</li>
+ * <li>Errors are reported to standard error.</li>
+ * </ul>
+ *
+ * To override these characteristics, either call functions like
+ * Clp_SetUTF8(), or create your Clp_Parser with no arguments or options
+ * (<tt>Clp_NewParser(0, 0, 0, 0)</tt>) and set the arguments and options
+ * later.
+ *
+ * Returns NULL if there isn't enough memory to construct the parser.
+ *
+ * @note The CLP library will not modify the contents of @a argv or @a opt.
+ * The calling program must not modify @a opt. It may modify @a argv in
+ * limited cases.
+ */
Clp_Parser *
-Clp_NewParser(int argc, const char * const *argv, int nopt, Clp_Option *opt)
- /* Creates and returns a new Clp_Parser using the options in 'opt',
- or 0 on memory allocation failure */
+Clp_NewParser(int argc, const char * const *argv, int nopt, const Clp_Option *opt)
{
- int i;
Clp_Parser *clp = (Clp_Parser *)malloc(sizeof(Clp_Parser));
Clp_Internal *cli = (Clp_Internal *)malloc(sizeof(Clp_Internal));
- Clp_LongMinMatch *lmm = (Clp_LongMinMatch *)malloc(sizeof(Clp_LongMinMatch) * nopt);
- if (!clp || !cli || !lmm)
+ Clp_InternOption *iopt = (Clp_InternOption *)malloc(sizeof(Clp_InternOption) * nopt);
+ if (!clp || !cli || !iopt)
goto failed;
-
- clp->internal = cli;
- cli->long_min_match = lmm;
- /* Assign arguments (need to do this now so we can call Clp_OptionError) */
- cli->argc = argc;
- cli->argv = argv;
- {
- const char *slash = strrchr(argv[0], '/');
- cli->program_name = slash ? slash + 1 : argv[0];
- }
- cli->error_handler = 0;
-
- /* Get rid of negative option_ids, which are internal to CLP */
- for (i = 0; i < nopt; i++)
- if (opt[i].option_id < 0) {
- Clp_OptionError(clp, "CLP internal error: option %d has negative option_id", i);
- opt[i] = opt[nopt - 1];
- nopt--;
- i--;
- }
-
- /* Massage the options to make them usable */
- for (i = 0; i < nopt; i++) {
- /* Enforce invariants */
- if (opt[i].arg_type <= 0)
- opt[i].flags &= ~Clp_AnyArgument;
- if (opt[i].arg_type > 0 && !TEST(&opt[i], Clp_Optional))
- opt[i].flags |= Clp_Mandatory;
-
- /* Nonexistent short options have character 256. We know this won't
- equal any character in an argument, even if characters are signed */
- if (opt[i].short_name <= 0 || opt[i].short_name > 255)
- opt[i].short_name = 256;
+ clp->negated = 0;
+ clp->have_val = 0;
+ clp->vstr = 0;
+ clp->user_data = 0;
+ clp->internal = cli;
- /* Options that start with 'no-' should be changed to OnlyNegated */
- if (opt[i].long_name && strncmp(opt[i].long_name, "no-", 3) == 0) {
- opt[i].long_name += 3;
- opt[i].flags |= Clp_Negate | Clp_OnlyNegated;
- }
- }
-
- /* Check for duplicated short options */
- check_duplicated_short_options(clp, nopt, opt, 0);
- check_duplicated_short_options(clp, nopt, opt, 1);
-
- /* Calculate long options' minimum unambiguous length */
- for (i = 0; i < nopt; i++)
- if (opt[i].long_name && !TEST(&opt[i], Clp_OnlyNegated))
- lmm[i].pos = calculate_long_min_match
- (nopt, opt, i, Clp_OnlyNegated, 0);
- for (i = 0; i < nopt; i++)
- if (opt[i].long_name && TEST(&opt[i], Clp_Negate))
- lmm[i].neg = calculate_long_min_match
- (nopt, opt, i, Clp_Negate, Clp_Negate);
-
- /* Set up clp->internal */
cli->opt = opt;
cli->nopt = nopt;
-
- cli->argtype = (Clp_ArgType *)malloc(sizeof(Clp_ArgType) * 8);
- if (!cli->argtype)
- goto failed;
- for (i = 0; i < 8; i++)
- cli->argtype[i].func = 0;
- cli->nargtype = 8;
-
- for (i = 0; i < 256; i++)
- cli->option_class[i] = 0;
- cli->option_class[(unsigned char) '-'] = Clp_Short;
- cli->both_short_and_long = 0;
+ cli->iopt = iopt;
+ cli->opt_generation = 0;
+ cli->error_handler = 0;
- cli->is_short = 0;
- cli->whole_negated = 0;
-
- cli->option_processing = 1;
- cli->current_option = 0;
+ /* Assign program name (now so we can call Clp_OptionError) */
+ if (argc > 0) {
+ const char *slash = strrchr(argv[0], '/');
+ cli->program_name = slash ? slash + 1 : argv[0];
+ } else
+ cli->program_name = 0;
+
+ /* Assign arguments, skipping program name */
+ Clp_SetArguments(clp, argc - 1, argv + 1);
+
+ /* Initialize UTF-8 status and option classes */
+ {
+ char *s = getenv("LANG");
+ cli->utf8 = (s && (strstr(s, "UTF-8") != 0 || strstr(s, "UTF8") != 0
+ || strstr(s, "utf8") != 0));
+ }
+ cli->oclass[0].c = '-';
+ cli->oclass[0].type = Clp_Short;
+ cli->noclass = 1;
+ cli->long1pos = cli->long1neg = 0;
/* Add default type parsers */
- Clp_AddType(clp, Clp_ArgString, 0, parse_string, 0);
- Clp_AddType(clp, Clp_ArgStringNotOption, Clp_DisallowOptions, parse_string, 0);
- Clp_AddType(clp, Clp_ArgInt, 0, parse_int, 0);
- Clp_AddType(clp, Clp_ArgUnsigned, 0, parse_int, (void *)cli);
- Clp_AddType(clp, Clp_ArgBool, 0, parse_bool, 0);
- Clp_AddType(clp, Clp_ArgDouble, 0, parse_double, 0);
- return clp;
+ cli->valtype = (Clp_ValType *)malloc(sizeof(Clp_ValType) * Clp_InitialValType);
+ if (!cli->valtype)
+ goto failed;
+ cli->nvaltype = 0;
+ Clp_AddType(clp, Clp_ValString, 0, parse_string, 0);
+ Clp_AddType(clp, Clp_ValStringNotOption, Clp_DisallowOptions, parse_string, 0);
+ Clp_AddType(clp, Clp_ValInt, 0, parse_int, 0);
+ Clp_AddType(clp, Clp_ValUnsigned, 0, parse_int, (void *)cli);
+ Clp_AddType(clp, Clp_ValBool, 0, parse_bool, 0);
+ Clp_AddType(clp, Clp_ValDouble, 0, parse_double, 0);
+
+ /* Set options */
+ Clp_SetOptions(clp, nopt, opt);
+
+ return clp;
+
failed:
- /* It should be OK to free(0), but on some ancient systems, it isn't */
- if (cli && cli->argtype)
- free(cli->argtype);
+ if (cli && cli->valtype)
+ free(cli->valtype);
if (cli)
free(cli);
if (clp)
free(clp);
- if (lmm)
- free(lmm);
+ if (iopt)
+ free(iopt);
return 0;
}
+/** @param clp the parser
+ *
+ * All memory associated with @a clp is freed. */
void
Clp_DeleteParser(Clp_Parser *clp)
- /* Destroys the Clp_Parser 'clp' and any associated memory allocated by
- CLP */
{
int i;
Clp_Internal *cli;
@@ -274,156 +550,331 @@ Clp_DeleteParser(Clp_Parser *clp)
cli = clp->internal;
/* get rid of any string list types */
- for (i = 0; i < cli->nargtype; i++)
- if (cli->argtype[i].func == parse_string_list) {
- Clp_StringList *clsl = (Clp_StringList *)cli->argtype[i].thunk;
+ for (i = 0; i < cli->nvaltype; i++)
+ if (cli->valtype[i].func == parse_string_list) {
+ Clp_StringList *clsl = (Clp_StringList *)cli->valtype[i].user_data;
free(clsl->items);
- free(clsl->long_min_match);
+ free(clsl->iopt);
free(clsl);
}
-
- free(cli->argtype);
- free(cli->long_min_match);
+
+ free(cli->valtype);
+ free(cli->iopt);
free(cli);
free(clp);
}
-int
-Clp_SetOptionProcessing(Clp_Parser *clp, int option_processing)
- /* Sets whether command line arguments are parsed (looking for options)
- at all. Each parser starts out with OptionProcessing true. Returns old
- value. */
+
+/** @param clp the parser
+ * @param errh error handler function
+ * @return previous error handler function
+ *
+ * The error handler function is called when CLP encounters an error while
+ * parsing the command line. It is called with the arguments "<tt>(*errh)(@a
+ * clp, s)</tt>", where <tt>s</tt> is a description of the error terminated by
+ * a newline. The <tt>s</tt> descriptions produced by CLP itself are prefixed
+ * by the program name, if any. */
+Clp_ErrorHandler
+Clp_SetErrorHandler(Clp_Parser *clp, void (*errh)(Clp_Parser *, const char *))
{
Clp_Internal *cli = clp->internal;
- int old = cli->option_processing;
- cli->option_processing = option_processing;
+ Clp_ErrorHandler old = cli->error_handler;
+ cli->error_handler = errh;
return old;
}
-Clp_ErrorHandler
-Clp_SetErrorHandler(Clp_Parser *clp, void (*error_handler)(const char *))
- /* Sets a hook function to be called before Clp_OptionError
- prints anything. 0 means nothing will be called. */
+/** @param clp the parser
+ * @param utf8 does the parser support UTF-8?
+ * @return previous UTF-8 mode
+ *
+ * In UTF-8 mode, all input strings (arguments and long names for options) are
+ * assumed to be encoded via UTF-8, and all character names
+ * (Clp_SetOptionChar() and short names for options) may cover the whole
+ * Unicode range. Out of UTF-8 mode, all input strings are treated as binary,
+ * and all character names must be unsigned char values.
+ *
+ * Furthermore, error messages in UTF-8 mode may contain Unicode quote
+ * characters. */
+int
+Clp_SetUTF8(Clp_Parser *clp, int utf8)
{
Clp_Internal *cli = clp->internal;
- Clp_ErrorHandler old = cli->error_handler;
- cli->error_handler = error_handler;
- return old;
+ int i, j, old_utf8 = cli->utf8;
+ cli->utf8 = utf8;
+ for (i = 0; i < cli->nopt; ++i) {
+ cli->iopt[i].lmmpos = cli->iopt[i].lmmneg = 1;
+ cli->iopt[i].lmmpos_short = cli->iopt[i].lmmneg_short = 0;
+ for (j = 0; j < cli->nopt; ++j)
+ compare_options(clp, &cli->opt[i], &cli->iopt[i],
+ &cli->opt[j], &cli->iopt[j]);
+ }
+ return old_utf8;
}
int
-Clp_SetOptionChar(Clp_Parser *clp, int c, int option_type)
- /* Determines how clp will deal with short options.
- option_type must be a sum of:
-
- 0 == Clp_NotOption 'c' isn't an option.
- Clp_Short 'c' introduces a list of short options.
- Clp_Long 'c' introduces a long option.
- Clp_ShortNegated 'c' introduces a negated list of
- short options.
- Clp_LongNegated 'c' introduces a negated long option.
- Clp_LongImplicit 'c' introduces a long option, and *is part
- of the long option itself*.
-
- Some values are not allowed (Clp_Long | Clp_LongNegated isn't allowed,
- for instance). c=0 means ALL characters are that type. Returns 0 on
- failure (you gave an illegal option_type), 1 on success. */
+Clp_OptionChar(Clp_Parser *clp, int c)
{
- int i;
Clp_Internal *cli = clp->internal;
-
- if (option_type < 0
- || option_type >= 2*Clp_LongImplicit
- || ((option_type & Clp_Short) && (option_type & Clp_ShortNegated))
- || ((option_type & Clp_Long) && (option_type & Clp_LongNegated))
- || ((option_type & Clp_LongImplicit) && (option_type & (Clp_Short | Clp_ShortNegated | Clp_Long | Clp_LongNegated))))
- return 0;
-
+ int i, oclass = 0;
+ if (cli->noclass > 0 && cli->oclass[0].c == 0)
+ oclass = cli->oclass[0].type;
+ for (i = 0; i < cli->noclass; ++i)
+ if (cli->oclass[i].c == c)
+ oclass = cli->oclass[i].type;
+ return oclass;
+}
+
+/** @param clp the parser
+ * @param c character
+ * @param type option character treatment
+ * @return previous option character treatment, or -1 on error
+ *
+ * @a type specifies how CLP treats arguments that begin with character @a c.
+ * Possibilities are:
+ *
+ * <dl>
+ * <dt>Clp_NotOption (or 0)</dt>
+ * <dd>The argument cannot be an option.</dd>
+ * <dt>Clp_Long</dt>
+ * <dd>The argument is a long option.</dd>
+ * <dt>Clp_Short</dt>
+ * <dd>The argument is a set of short options.</dd>
+ * <dt>Clp_Short|Clp_Long</dt>
+ * <dd>The argument is either a long option or, if no matching long option is
+ * found, a set of short options.</dd>
+ * <dt>Clp_LongNegated</dt>
+ * <dd>The argument is a negated long option. For example, after
+ * Clp_SetOptionChar(@a clp, '^', Clp_LongNegated), the argument "^foo" is
+ * equivalent to "--no-foo".</dd>
+ * <dt>Clp_ShortNegated</dt>
+ * <dd>The argument is a set of negated short options.</dd>
+ * <dt>Clp_ShortNegated|Clp_LongNegated</dt>
+ * <dd>The argument is either a negated long option or, if no matching long
+ * option is found, a set of negated short options.</dd>
+ * <dt>Clp_LongImplicit</dt>
+ * <dd>The argument may be a long option, where the character @a c is actually
+ * part of the long option name. For example, after Clp_SetOptionChar(@a clp,
+ * 'f', Clp_LongImplicit), the argument "foo" may be equivalent to
+ * "--foo".</dd>
+ * </dl>
+ *
+ * In UTF-8 mode, @a c may be any Unicode character. Otherwise, @a c must be
+ * an unsigned char value. The special character 0 assigns @a type to @em
+ * every character.
+ *
+ * It is an error if @a c is out of range, @a type is illegal, or there are
+ * too many character definitions stored in @a clp already. The function
+ * returns -1 on error.
+ *
+ * A double hyphen "--" always introduces a long option. This behavior cannot
+ * currently be changed with Clp_SetOptionChar().
+ */
+int
+Clp_SetOptionChar(Clp_Parser *clp, int c, int type)
+{
+ int i, j, long1pos, long1neg;
+ int old = Clp_OptionChar(clp, c);
+ Clp_Internal *cli = clp->internal;
+
+ if (type != Clp_NotOption && type != Clp_Short && type != Clp_Long
+ && type != Clp_ShortNegated && type != Clp_LongNegated
+ && type != Clp_LongImplicit && type != (Clp_Short | Clp_Long)
+ && type != (Clp_ShortNegated | Clp_LongNegated))
+ return -1;
+ if (c < 0 || c >= (cli->utf8 ? 0x110000 : 256))
+ return -1;
+
if (c == 0)
- for (i = 1; i < 256; i++)
- cli->option_class[i] = option_type;
- else
- cli->option_class[(unsigned char) c] = option_type;
-
- /* If an option character can introduce either short or long options, then
- we need to fix up the long_min_match values. We may have set the
- long_min_match for option 'abcde' to 1, if no other option starts
- with 'a'. But if '-' can introduce either a short option or a long
- option, AND a short option '-a' exists, then the long_min_match for
- 'abcde' must be set to 2! */
- if (!cli->both_short_and_long) {
- int either_short = option_type & (Clp_Short | Clp_ShortNegated);
- int either_long = option_type & (Clp_Long | Clp_LongNegated);
- if (either_short && either_long) {
- unsigned char have_short[257];
- for (i = 0; i < 256; i++)
- have_short[i] = 0;
- for (i = 0; i < cli->nopt; i++)
- have_short[cli->opt[i].short_name] = 1;
- for (i = 0; i < cli->nopt; i++)
- if (cli->opt[i].long_name && cli->long_min_match[i].pos == 1) {
- /* if '--Cxxxx's short name is '-C', keep long_min_match
- == 1 */
- unsigned char first = (unsigned char)cli->opt[i].long_name[0];
- if (have_short[first] && first != cli->opt[i].short_name)
- cli->long_min_match[i].pos++;
- }
- cli->both_short_and_long = 1;
+ cli->noclass = 0;
+ for (i = 0; i < cli->noclass; ++i)
+ if (cli->oclass[i].c == c)
+ break;
+ if (i == Clp_OclassSize)
+ return -1;
+
+ cli->oclass[i].c = c;
+ cli->oclass[i].type = type;
+ if (cli->noclass == i)
+ cli->noclass = i + 1;
+
+ long1pos = long1neg = 0;
+ for (i = 0; i < cli->noclass; ++i) {
+ if ((cli->oclass[i].type & Clp_Short)
+ && (cli->oclass[i].type & Clp_Long))
+ long1pos = 1;
+ if ((cli->oclass[i].type & Clp_ShortNegated)
+ && (cli->oclass[i].type & Clp_LongNegated))
+ long1neg = 1;
+ }
+
+ if (long1pos != cli->long1pos || long1neg != cli->long1neg) {
+ /* Must recheck option set */
+ cli->long1pos = long1pos;
+ cli->long1neg = long1neg;
+ for (i = 0; i < cli->nopt; ++i) {
+ cli->iopt[i].lmmpos = cli->iopt[i].lmmneg = 1;
+ cli->iopt[i].lmmpos_short = cli->iopt[i].lmmneg_short = 0;
+ for (j = 0; j < cli->nopt; ++j)
+ compare_options(clp, &cli->opt[i], &cli->iopt[i],
+ &cli->opt[j], &cli->iopt[j]);
}
}
- return 1;
+ return old;
}
-const char *
-Clp_ProgramName(Clp_Parser *clp)
+/** @param clp the parser
+ * @param nopt number of option definitions
+ * @param opt option definition array
+ * @return 0 on success, -1 on failure
+ *
+ * Installs the option definitions in @a opt. Future option parsing will
+ * use @a opt to search for options.
+ *
+ * Also checks @a opt's option definitions for validity. "CLP internal
+ * errors" are reported via Clp_OptionError() if:
+ *
+ * <ul>
+ * <li>An option has a negative ID.</li>
+ * <li>Two different short options have the same name.</li>
+ * <li>Two different long options have the same name.</li>
+ * <li>A short and a long option are ambiguous, in that some option character
+ * might introduce either a short or a long option (e.g., Clp_SetOptionChar(@a
+ * clp, '-', Clp_Long|Clp_Short)), and a short name equals a long name.</li>
+ * </ul>
+ *
+ * If necessary memory cannot be allocated, this function returns -1 without
+ * modifying the parser.
+ *
+ * @note The CLP library will not modify the contents of @a argv or @a opt.
+ * The calling program must not modify @a opt either until another call to
+ * Clp_SetOptions() or the parser is destroyed.
+ */
+int
+Clp_SetOptions(Clp_Parser *clp, int nopt, const Clp_Option *opt)
{
- return clp->internal->program_name;
+ Clp_Internal *cli = clp->internal;
+ Clp_InternOption *iopt;
+ int i, j;
+ static unsigned opt_generation = 0;
+
+ if (nopt > cli->nopt) {
+ iopt = (Clp_InternOption *)malloc(sizeof(Clp_InternOption) * nopt);
+ if (!iopt)
+ return -1;
+ free(cli->iopt);
+ cli->iopt = iopt;
+ }
+
+ cli->opt = opt;
+ cli->nopt = nopt;
+ cli->opt_generation = ++opt_generation;
+ iopt = cli->iopt;
+ cli->current_option = -1;
+
+ /* Massage the options to make them usable */
+ for (i = 0; i < nopt; i++) {
+ /* Ignore negative option_ids, which are internal to CLP */
+ if (opt[i].option_id < 0) {
+ Clp_OptionError(clp, "CLP internal error: option %d has negative option_id", i);
+ iopt[i].ilong = iopt[i].ishort = iopt[i].ipos = iopt[i].ineg = 0;
+ continue;
+ }
+
+ /* Set flags based on input flags */
+ iopt[i].ilong = (opt[i].long_name != 0 && opt[i].long_name[0] != 0);
+ iopt[i].ishort = (opt[i].short_name > 0
+ && opt[i].short_name < (cli->utf8 ? 0x110000 : 256));
+ iopt[i].ipos = 1;
+ iopt[i].ineg = (opt[i].flags & Clp_Negate) != 0;
+ iopt[i].imandatory = (opt[i].flags & Clp_Mandatory) != 0;
+ iopt[i].ioptional = (opt[i].flags & Clp_Optional) != 0;
+ iopt[i].iprefmatch = (opt[i].flags & Clp_PreferredMatch) != 0;
+ iopt[i].ilongoff = 0;
+
+ /* Enforce invariants */
+ if (opt[i].val_type <= 0)
+ iopt[i].imandatory = iopt[i].ioptional = 0;
+ if (opt[i].val_type > 0 && !iopt[i].ioptional)
+ iopt[i].imandatory = 1;
+
+ /* Options that start with 'no-' should be changed to OnlyNegated */
+ if (iopt[i].ilong && strncmp(opt[i].long_name, "no-", 3) == 0) {
+ iopt[i].ipos = 0;
+ iopt[i].ineg = 1;
+ iopt[i].ilongoff = 3;
+ if (strncmp(opt[i].long_name + 3, "no-", 3) == 0)
+ Clp_OptionError(clp, "CLP internal error: option %d begins with \"no-no-\"", i);
+ } else if (opt[i].flags & Clp_OnlyNegated) {
+ iopt[i].ipos = 0;
+ iopt[i].ineg = 1;
+ }
+ }
+
+ /* Check option set */
+ for (i = 0; i < nopt; ++i) {
+ iopt[i].lmmpos = iopt[i].lmmneg = 1;
+ iopt[i].lmmpos_short = iopt[i].lmmneg_short = 0;
+ for (j = 0; j < nopt; ++j)
+ compare_options(clp, &opt[i], &iopt[i], &opt[j], &iopt[j]);
+ }
+
+ return 0;
}
+/** @param clp the parser
+ * @param argc number of arguments
+ * @param argv argument array
+ *
+ * Installs the arguments in @a argv for parsing. Future option parsing will
+ * analyze @a argv.
+ *
+ * Unlike Clp_NewParser(), this function does not treat @a argv[0] specially.
+ * The first subsequent call to Clp_Next() will analyze @a argv[0].
+ *
+ * This function also sets option processing to on, as by
+ * Clp_SetOptionProcessing(@a clp, 1).
+ *
+ * @note The CLP library will not modify the contents of @a argv. The calling
+ * program should not generally modify the element of @a argv that CLP is
+ * currently analyzing.
+ */
void
-Clp_SetProgramName(Clp_Parser *clp, const char *program_name)
+Clp_SetArguments(Clp_Parser *clp, int argc, const char * const *argv)
{
- clp->internal->program_name = program_name;
-}
+ Clp_Internal *cli = clp->internal;
+
+ cli->argc = argc + 1;
+ cli->argv = argv - 1;
+ cli->is_short = 0;
+ cli->whole_negated = 0;
+ cli->option_processing = 1;
+ cli->current_option = -1;
+}
-/*******
- * functions for Clp_Option lists
- **/
-static int
-min_different_chars(const char *s, const char *t)
- /* Returns the minimum number of characters required to distinguish
- s from t.
- If s is shorter than t, returns strlen(s). */
+/** @param clp the parser
+ * @param on whether to search for options
+ * @return previous option processing setting
+ *
+ * When option processing is off, every call to Clp_Next() returns
+ * Clp_NotOption. By default the option <tt>"--"</tt> turns off option
+ * processing and is otherwise ignored.
+ */
+int
+Clp_SetOptionProcessing(Clp_Parser *clp, int on)
{
- const char *sfirst = s;
- while (*s && *t && *s == *t)
- s++, t++;
- if (!*s)
- return s - sfirst;
- else
- return s - sfirst + 1;
+ Clp_Internal *cli = clp->internal;
+ int old = cli->option_processing;
+ cli->option_processing = on;
+ return old;
}
-static int
-calculate_long_min_match(int nopt, Clp_Option *opt, int which,
- int flags, int flags_value)
-{
- int j, lmm = 1;
- int preferred = (opt[which].flags & Clp_PreferredMatch);
-
- for (j = 0; j < nopt; j++)
- if (opt[j].long_name
- && (opt[j].flags & flags) == flags_value
- && opt[which].option_id != opt[j].option_id
- && strncmp(opt[which].long_name, opt[j].long_name, lmm) == 0
- && (!preferred || strncmp(opt[which].long_name, opt[j].long_name, strlen(opt[which].long_name)) != 0))
- lmm = min_different_chars(opt[which].long_name, opt[j].long_name);
-
- return lmm;
-}
+
+/*******
+ * functions for Clp_Option lists
+ **/
/* the ever-glorious argcmp */
@@ -466,26 +917,30 @@ argcmp(const char *ref, const char *arg, int min_match, int fewer_dashes)
}
static int
-find_prefix_opt(const char *arg, int nopt, Clp_Option *opt,
- Clp_LongMinMatch *lmmvec,
- int *ambiguous, int *ambiguous_values, int negated)
+find_prefix_opt(Clp_Parser *clp, const char *arg,
+ int nopt, const Clp_Option *opt,
+ const Clp_InternOption *iopt,
+ int *ambiguous, int *ambiguous_values)
/* Looks for an unambiguous match of 'arg' against one of the long
options in 'opt'. Returns positive if it finds one; otherwise, returns
-1 and possibly changes 'ambiguous' and 'ambiguous_values' to keep
track of at most MAX_AMBIGUOUS_VALUES possibilities. */
{
int i, fewer_dashes = 0, first_ambiguous = *ambiguous;
+ int negated = clp && clp->negated;
+ int first_charlen = (clp ? clp_utf8_charlen(clp->internal, arg) : 1);
retry:
for (i = 0; i < nopt; i++) {
int len, lmm;
- if (!opt[i].long_name
- || (negated && !TEST(&opt[i], Clp_Negate))
- || (!negated && TEST(&opt[i], Clp_OnlyNegated)))
+ if (!iopt[i].ilong || (negated ? !iopt[i].ineg : !iopt[i].ipos))
continue;
- lmm = (negated ? lmmvec[i].neg : lmmvec[i].pos);
- len = argcmp(opt[i].long_name, arg, lmm, fewer_dashes);
+ lmm = (negated ? iopt[i].lmmneg : iopt[i].lmmpos);
+ if (clp && clp->internal->could_be_short
+ && (negated ? iopt[i].lmmneg_short : iopt[i].lmmpos_short))
+ lmm = (first_charlen >= lmm ? first_charlen + 1 : lmm);
+ len = argcmp(opt[i].long_name + iopt[i].ilongoff, arg, lmm, fewer_dashes);
if (len > 0)
return i;
else if (len < 0) {
@@ -509,42 +964,90 @@ find_prefix_opt(const char *arg, int nopt, Clp_Option *opt,
* Argument parsing
**/
+static int
+val_type_binsearch(Clp_Internal *cli, int val_type)
+{
+ unsigned l = 0, r = cli->nvaltype;
+ while (l < r) {
+ unsigned m = l + (r - l) / 2;
+ if (cli->valtype[m].val_type == val_type)
+ return m;
+ else if (cli->valtype[m].val_type < val_type)
+ l = m + 1;
+ else
+ r = m;
+ }
+ return l;
+}
+
+/** @param clp the parser
+ * @param val_type value type ID
+ * @param flags value type flags
+ * @param parser parser function
+ * @param user_data user data for @a parser function
+ * @return 0 on success, -1 on failure
+ *
+ * Defines argument type @a val_type in parser @a clp. The parsing function
+ * @a parser will be passed argument values for type @a val_type. It should
+ * parse the argument into values (usually in @a clp->val, but sometimes
+ * elsewhere), report errors if necessary, and return whether the parse was
+ * successful.
+ *
+ * Any prior argument parser match @a val_type is removed. @a val_type must
+ * be greater than zero.
+ *
+ * @a flags specifies additional parsing flags. At the moment the only
+ * relevant flag is Clp_DisallowOptions, which means that separated values
+ * must not look like options. For example, assume argument
+ * <tt>--a</tt>/<tt>-a</tt> has mandatory value type Clp_ValStringNotOption
+ * (which has Clp_DisallowOptions). Then:
+ *
+ * <ul>
+ * <li><tt>--a=--b</tt> will parse with value <tt>--b</tt>.</li>
+ * <li><tt>-a--b</tt> will parse with value <tt>--b</tt>.</li>
+ * <li><tt>--a --b</tt> will not parse, since the mandatory value looks like
+ * an option.</li>
+ * <li><tt>-a --b</tt> will not parse, since the mandatory value looks like
+ * an option.</li>
+ * </ul>
+ */
int
-Clp_AddType(Clp_Parser *clp, int type_id, int flags,
- Clp_ArgParseFunc func, void *thunk)
- /* Add a argument parser for type_id to the Clp_Parser. When an argument
- arg for Clp_Option opt is being processed, the parser routines will
- call (*func)(clp, opt, arg, thunk, complain)
- where complain is 1 if the routine should report errors, or 0 if it
- should fail silently.
- Returns 1 on success, 0 if memory allocation fails or the arguments
- are bad. */
+Clp_AddType(Clp_Parser *clp, int val_type, int flags,
+ Clp_ValParseFunc parser, void *user_data)
{
- int i;
Clp_Internal *cli = clp->internal;
- Clp_ArgType *new_argtype;
- int nargtype = cli->nargtype;
- assert(nargtype);
- if (type_id <= 0 || !func)
- return 0;
-
- while (nargtype <= type_id)
- nargtype *= 2;
- new_argtype = (Clp_ArgType *)
- realloc(cli->argtype, sizeof(Clp_ArgType) * nargtype);
- if (!new_argtype)
- return 0;
- cli->argtype = new_argtype;
-
- for (i = cli->nargtype; i < nargtype; i++)
- cli->argtype[i].func = 0;
- cli->nargtype = nargtype;
-
- cli->argtype[type_id].func = func;
- cli->argtype[type_id].flags = flags;
- cli->argtype[type_id].thunk = thunk;
- return 1;
+ if (val_type <= 0 || !parser)
+ return -1;
+
+ int vtpos = val_type_binsearch(cli, val_type);
+
+ if (vtpos == cli->nvaltype || cli->valtype[vtpos].val_type != val_type) {
+ if (cli->nvaltype != 0 && (cli->nvaltype % Clp_InitialValType) == 0) {
+ Clp_ValType *new_valtype =
+ (Clp_ValType *) realloc(cli->valtype, sizeof(Clp_ValType) * (cli->nvaltype + Clp_InitialValType));
+ if (!new_valtype)
+ return -1;
+ cli->valtype = new_valtype;
+ }
+ memmove(&cli->valtype[vtpos + 1], &cli->valtype[vtpos],
+ sizeof(Clp_ValType) * (cli->nvaltype - vtpos));
+ cli->nvaltype++;
+ cli->valtype[vtpos].func = 0;
+ }
+
+ if (cli->valtype[vtpos].func == parse_string_list) {
+ Clp_StringList *clsl = (Clp_StringList *) cli->valtype[vtpos].user_data;
+ free(clsl->items);
+ free(clsl->iopt);
+ free(clsl);
+ }
+
+ cli->valtype[vtpos].val_type = val_type;
+ cli->valtype[vtpos].func = parser;
+ cli->valtype[vtpos].flags = flags;
+ cli->valtype[vtpos].user_data = user_data;
+ return 0;
}
@@ -553,72 +1056,71 @@ Clp_AddType(Clp_Parser *clp, int type_id, int flags,
**/
static int
-parse_string(Clp_Parser *clp, const char *arg, int complain, void *thunk)
+parse_string(Clp_Parser *clp, const char *arg, int complain, void *user_data)
{
- (void)complain, (void)thunk;
+ (void)complain, (void)user_data;
clp->val.s = arg;
return 1;
}
static int
-parse_int(Clp_Parser *clp, const char *arg, int complain, void *thunk)
+parse_int(Clp_Parser *clp, const char *arg, int complain, void *user_data)
{
char *val;
- int base = 10;
- if (arg[0] == '0' && (arg[1] == 'x' || arg[1] == 'X')) {
- base = 16;
- arg += 2;
- }
-
- if (thunk != 0) { /* unsigned */
+ if (*arg == 0 || isspace((unsigned char) *arg)
+ || (user_data != 0 && *arg == '-'))
+ val = (char *) arg;
+ else if (user_data != 0) { /* unsigned */
#if HAVE_STRTOUL
- clp->val.u = strtoul(arg, &val, base);
+ clp->val.u = strtoul(arg, &val, 0);
#else
/* don't bother really trying to do it right */
if (arg[0] == '-')
val = (char *) arg;
else
- clp->val.u = strtol(arg, &val, base);
+ clp->val.u = strtol(arg, &val, 0);
#endif
} else
- clp->val.i = strtol(arg, &val, base);
+ clp->val.i = strtol(arg, &val, 0);
if (*arg != 0 && *val == 0)
return 1;
else if (complain) {
- const char *message = thunk != 0
- ? "'%O' expects a nonnegative integer, not '%s'"
- : "'%O' expects an integer, not '%s'";
- if (base == 16) arg -= 2;
+ const char *message = user_data != 0
+ ? "%`%O%' expects a nonnegative integer, not %`%s%'"
+ : "%`%O%' expects an integer, not %`%s%'";
return Clp_OptionError(clp, message, arg);
} else
return 0;
}
static int
-parse_double(Clp_Parser *clp, const char *arg, int complain, void *thunk)
+parse_double(Clp_Parser *clp, const char *arg, int complain, void *user_data)
{
char *val;
- (void)thunk;
- clp->val.d = strtod(arg, &val);
+ (void)user_data;
+ if (*arg == 0 || isspace((unsigned char) *arg))
+ val = (char *) arg;
+ else
+ clp->val.d = strtod(arg, &val);
if (*arg != 0 && *val == 0)
return 1;
else if (complain)
- return Clp_OptionError(clp, "'%O' expects a real number, not '%s'", arg);
+ return Clp_OptionError(clp, "%`%O%' expects a real number, not %`%s%'", arg);
else
return 0;
}
static int
-parse_bool(Clp_Parser *clp, const char *arg, int complain, void *thunk)
+parse_bool(Clp_Parser *clp, const char *arg, int complain, void *user_data)
{
int i;
char lcarg[6];
- (void)thunk;
+ (void)user_data;
if (strlen(arg) > 5 || strchr(arg, '=') != 0)
goto error;
for (i = 0; arg[i] != 0; i++)
- lcarg[i] = tolower(arg[i]);
+ lcarg[i] = tolower((unsigned char) arg[i]);
lcarg[i] = 0;
if (argcmp("yes", lcarg, 1, 0) > 0
@@ -635,7 +1137,7 @@ parse_bool(Clp_Parser *clp, const char *arg, int complain, void *thunk)
error:
if (complain)
- Clp_OptionError(clp, "'%O' expects a true-or-false value, not '%s'", arg);
+ Clp_OptionError(clp, "%`%O%' expects a true-or-false value, not %`%s%'", arg);
return 0;
}
@@ -645,16 +1147,16 @@ parse_bool(Clp_Parser *clp, const char *arg, int complain, void *thunk)
**/
static int
-parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *thunk)
+parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *user_data)
{
- Clp_StringList *sl = (Clp_StringList *)thunk;
+ Clp_StringList *sl = (Clp_StringList *)user_data;
int idx, ambiguous = 0;
int ambiguous_values[MAX_AMBIGUOUS_VALUES + 1];
/* actually look for a string value */
idx = find_prefix_opt
- (arg, sl->nitems, sl->items, sl->long_min_match,
- &ambiguous, ambiguous_values, 0);
+ (0, arg, sl->nitems, sl->items, sl->iopt,
+ &ambiguous, ambiguous_values);
if (idx >= 0) {
clp->val.i = sl->items[idx].option_id;
return 1;
@@ -666,35 +1168,35 @@ parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *thunk)
}
if (complain) {
- const char *complaint = (ambiguous ? "an ambiguous" : "not a valid");
+ const char *complaint = (ambiguous ? "ambiguous" : "invalid");
if (!ambiguous) {
ambiguous = sl->nitems_invalid_report;
for (idx = 0; idx < ambiguous; idx++)
ambiguous_values[idx] = idx;
}
return ambiguity_error
- (clp, ambiguous, ambiguous_values, sl->items, "",
- "'%s' is %s argument to '%O'", arg, complaint);
+ (clp, ambiguous, ambiguous_values, sl->items, sl->iopt,
+ "", "option %`%O%' value %`%s%' is %s", arg, complaint);
} else
return 0;
}
int
-finish_string_list(Clp_Parser *clp, int type_id, int flags,
+finish_string_list(Clp_Parser *clp, int val_type, int flags,
Clp_Option *items, int nitems, int itemscap)
{
- int i;
+ int i, j;
Clp_StringList *clsl = (Clp_StringList *)malloc(sizeof(Clp_StringList));
- Clp_LongMinMatch *lmm = (Clp_LongMinMatch *)malloc(sizeof(Clp_LongMinMatch) * nitems);
- if (!clsl || !lmm)
+ Clp_InternOption *iopt = (Clp_InternOption *)malloc(sizeof(Clp_InternOption) * nitems);
+ if (!clsl || !iopt)
goto error;
clsl->items = items;
- clsl->long_min_match = lmm;
+ clsl->iopt = iopt;
clsl->nitems = nitems;
clsl->allow_int = (flags & Clp_AllowNumbers) != 0;
-
+
if (nitems < MAX_AMBIGUOUS_VALUES && nitems < itemscap && clsl->allow_int) {
items[nitems].long_name = "any integer";
clsl->nitems_invalid_report = nitems + 1;
@@ -702,37 +1204,55 @@ finish_string_list(Clp_Parser *clp, int type_id, int flags,
clsl->nitems_invalid_report = MAX_AMBIGUOUS_VALUES + 1;
else
clsl->nitems_invalid_report = nitems;
-
+
+ for (i = 0; i < nitems; i++) {
+ iopt[i].ilong = iopt[i].ipos = 1;
+ iopt[i].ishort = iopt[i].ineg = iopt[i].ilongoff = iopt[i].iprefmatch = 0;
+ iopt[i].lmmpos = 1;
+ iopt[i].lmmpos_short = 0;
+ }
for (i = 0; i < nitems; i++)
- lmm[i].pos = calculate_long_min_match(nitems, items, i, 0, 0);
+ for (j = 0; j < nitems; j++)
+ compare_options(clp, &items[i], &iopt[i], &items[j], &iopt[j]);
- if (Clp_AddType(clp, type_id, 0, parse_string_list, clsl))
- return 1;
+ if (Clp_AddType(clp, val_type, 0, parse_string_list, clsl) >= 0)
+ return 0;
error:
if (clsl)
free(clsl);
- if (lmm)
- free(lmm);
- return 0;
+ if (iopt)
+ free(iopt);
+ return -1;
}
+/** @param clp the parser
+ * @param val_type value type ID
+ * @param flags string list flags
+ * @return 0 on success, -1 on failure
+ *
+ * Defines argument type @a val_type in parser @a clp. The parsing function
+ * sets @a clp->val.i to an integer. The value string is matched against
+ * strings provided in the ellipsis arguments. For example, the
+ * Clp_AddStringListType() call below has the same effect as the
+ * Clp_AddStringListTypeVec() call:
+ *
+ * For example:
+ * @code
+ * Clp_AddStringListType(clp, 100, Clp_AllowNumbers, "cat", 1,
+ * "cattle", 2, "dog", 3, (const char *) NULL);
+ *
+ * const char * const strs[] = { "cat", "cattle", "dog" };
+ * const int vals[] = { 1, 2, 3 };
+ * Clp_AddStringListTypeVec(clp, 100, Clp_AllowNumbers, 3, strs, vals);
+ * @endcode
+ *
+ * @note The CLP library will not modify any of the passed-in strings. The
+ * calling program must not modify or free them either until the parser is
+ * destroyed.
+ */
int
-Clp_AddStringListType(Clp_Parser *clp, int type_id, int flags, ...)
- /* An easy way to add new types to clp.
- Call like this:
- Clp_AddStringListType
- (clp, type_id, flags,
- char *s_1, int value_1, ..., char *s_n, int value_n, 0);
-
- Defines type_id as a type in clp.
- This type accepts any of the strings s_1, ..., s_n
- (or unambiguous abbreviations thereof);
- if argument s_i is given, value_i is stored in clp->val.i.
- If Clp_AllowNumbers is set in flags,
- explicit integers are also allowed.
-
- Returns 1 on success, 0 on memory allocation errors. */
+Clp_AddStringListType(Clp_Parser *clp, int val_type, int flags, ...)
{
int nitems = 0;
int itemscap = 5;
@@ -768,42 +1288,79 @@ Clp_AddStringListType(Clp_Parser *clp, int type_id, int flags, ...)
}
va_end(val);
- if (finish_string_list(clp, type_id, flags, items, nitems, itemscap))
- return 1;
+ if (finish_string_list(clp, val_type, flags, items, nitems, itemscap) >= 0)
+ return 0;
error:
va_end(val);
if (items)
free(items);
- return 0;
+ return -1;
}
-
+/** @param clp the parser
+ * @param val_type value type ID
+ * @param flags string list flags
+ * @param nstrs number of strings in list
+ * @param strs array of strings
+ * @param vals array of values
+ * @return 0 on success, -1 on failure
+ *
+ * Defines argument type @a val_type in parser @a clp. The parsing function
+ * sets @a clp->val.i to an integer. The value string is matched against the
+ * @a strs. If there's a unique match, the corresponding entry from @a vals
+ * is returned. Unique prefix matches also work. Finally, if @a flags
+ * contains the Clp_AllowNumbers flag, then integers are also accepted.
+ *
+ * For example:
+ * @code
+ * const char * const strs[] = { "cat", "cattle", "dog" };
+ * const int vals[] = { 1, 2, 3 };
+ * Clp_AddStringListTypeVec(clp, 100, Clp_AllowNumbers, 3, strs, vals);
+ * @endcode
+ *
+ * Say that option <tt>--animal</tt> takes value type 100. Then:
+ *
+ * <ul>
+ * <li><tt>--animal=cat</tt> will succeed and set @a clp->val.i = 1.</li>
+ * <li><tt>--animal=cattle</tt> will succeed and set @a clp->val.i = 2.</li>
+ * <li><tt>--animal=dog</tt> will succeed and set @a clp->val.i = 3.</li>
+ * <li><tt>--animal=d</tt> will succeed and set @a clp->val.i = 3.</li>
+ * <li><tt>--animal=c</tt> will fail, since <tt>c</tt> is ambiguous.</li>
+ * <li><tt>--animal=4</tt> will succeed and set @a clp->val.i = 4.</li>
+ * </ul>
+ *
+ * @note The CLP library will not modify the contents of @a strs or @a vals.
+ * The calling program can modify the @a strs array, but the actual strings
+ * (for instance, @a strs[0] and @a strs[1]) must not be modified or freed
+ * until the parser is destroyed.
+ */
int
-Clp_AddStringListTypeVec(Clp_Parser *clp, int type_id, int flags,
- int nitems, char **strings, int *values)
+Clp_AddStringListTypeVec(Clp_Parser *clp, int val_type, int flags,
+ int nstrs, const char * const *strs,
+ const int *vals)
/* An alternate way to make a string list type. See Clp_AddStringListType
for the basics; this coalesces the strings and values into two arrays,
rather than spreading them out into a variable argument list. */
{
int i;
- int itemscap = (nitems < 5 ? 5 : nitems);
+ int itemscap = (nstrs < 5 ? 5 : nstrs);
Clp_Option *items = (Clp_Option *)malloc(sizeof(Clp_Option) * itemscap);
if (!items)
- return 0;
+ return -1;
/* copy over items */
- for (i = 0; i < nitems; i++) {
- items[i].long_name = strings[i];
- items[i].option_id = values[i];
+ for (i = 0; i < nstrs; i++) {
+ items[i].long_name = strs[i];
+ items[i].option_id = vals[i];
items[i].flags = 0;
}
- if (finish_string_list(clp, type_id, flags, items, nitems, itemscap))
- return 1;
+ if (finish_string_list(clp, val_type, flags, items, nstrs, itemscap) >= 0)
+ return 0;
else {
free(items);
- return 0;
+ return -1;
}
}
@@ -812,94 +1369,24 @@ Clp_AddStringListTypeVec(Clp_Parser *clp, int type_id, int flags,
* Returning information
**/
-Clp_Argv *
-Clp_NewArgv(const char *str_in, int len)
+const char *
+Clp_ProgramName(Clp_Parser *clp)
{
- int argcap = 32;
- Clp_Argv *clp_argv = (Clp_Argv *)malloc(sizeof(Clp_Argv));
- char *s, *end;
-
- if (!clp_argv)
- goto failed_all;
- if (len < 0)
- len = strlen(str_in);
- if (!(clp_argv->argv_buf = (char *)malloc(len + 1)))
- goto failed_argv_buf;
- if (!(clp_argv->argv = (char **)malloc(sizeof(char *) * argcap)))
- goto failed_argv;
- memcpy(clp_argv->argv_buf, str_in, len);
- end = clp_argv->argv_buf + len;
- *end = 0;
-
- /* Parse arguments */
- s = clp_argv->argv_buf;
- clp_argv->argc = 0;
- while (1) {
- char *arg, *sout;
- int state;
- while (s < end && isspace((unsigned char) *s))
- s++;
- if (s >= end)
- break;
- /* Parse single argument */
- for (arg = sout = s, state = 0; s < end; s++) {
- if (*s == '\'') {
- if (state == 0)
- state = '\'';
- else if (state == '\'')
- state = 0;
- else
- *sout++ = *s;
- } else if (*s == '\"') {
- if (state == 0)
- state = '\"';
- else if (state == '\"')
- state = 0;
- else
- *sout++ = *s;
- } else if (*s == '\\') {
- if (state == '\'' || s == end - 1)
- *sout++ = *s;
- else
- *sout++ = *++s;
- } else if (isspace((unsigned char) *s)) {
- if (state == 0)
- break;
- else
- *sout++ = *s;
- } else
- *sout++ = *s;
- }
- *sout = 0;
- s++;
- /* Store argument */
- if (clp_argv->argc < argcap - 2) {
- argcap *= 2;
- if (!(clp_argv->argv = (char **)realloc(clp_argv->argv, sizeof(char *) * argcap)))
- goto failed_argv;
- }
- clp_argv->argv[clp_argv->argc++] = arg;
- }
- clp_argv->argv[clp_argv->argc] = 0; /* know we have space */
-
- return clp_argv;
-
- failed_argv:
- free(clp_argv->argv_buf);
- failed_argv_buf:
- free(clp_argv);
- failed_all:
- return 0;
+ return clp->internal->program_name;
}
-void
-Clp_DeleteArgv(Clp_Argv *clp_argv)
+/** @param clp the parser
+ * @param name new program name
+ * @return previous program name
+ *
+ * The calling program should not modify or free @a name until @a clp itself
+ * is destroyed. */
+const char *
+Clp_SetProgramName(Clp_Parser *clp, const char *name)
{
- if (!clp_argv)
- return;
- free(clp_argv->argv);
- free(clp_argv->argv_buf);
- free(clp_argv);
+ const char *old = clp->internal->program_name;
+ clp->internal->program_name = name;
+ return old;
}
@@ -907,44 +1394,105 @@ Clp_DeleteArgv(Clp_Argv *clp_argv)
* Clp_ParserStates
**/
+/** @return the parser state
+ *
+ * A Clp_ParserState object can store a parsing state of a Clp_Parser object.
+ * This state specifies exactly how far the Clp_Parser has gotten in parsing
+ * an argument list. The Clp_SaveParser() and Clp_RestoreParser() functions
+ * can be used to save this state and then restore it later, allowing a
+ * Clp_Parser to switch among argument lists.
+ *
+ * The initial state is empty, in that after Clp_RestoreParser(clp, state),
+ * Clp_Next(clp) would return Clp_Done.
+ *
+ * Parser states can be saved and restored among different parser objects.
+ *
+ * @sa Clp_DeleteParserState, Clp_SaveParser, Clp_RestoreParser
+ */
Clp_ParserState *
Clp_NewParserState(void)
{
- return (Clp_ParserState *)malloc(sizeof(Clp_ParserState));
+ Clp_ParserState *state = (Clp_ParserState *)malloc(sizeof(Clp_ParserState));
+ if (state) {
+ state->argv = 0;
+ state->argc = 0;
+ state->option_chars[0] = 0;
+ state->xtext = 0;
+ state->option_processing = 0;
+ state->opt_generation = 0;
+ state->current_option = -1;
+ state->is_short = 0;
+ state->whole_negated = 0;
+ state->current_short = 0;
+ state->negated_by_no = 0;
+ }
+ return state;
}
+/** @param state parser state
+ *
+ * The memory associated with @a state is freed.
+ */
void
-Clp_DeleteParserState(Clp_ParserState *save)
+Clp_DeleteParserState(Clp_ParserState *state)
{
- free(save);
+ free(state);
}
-
+/** @param clp the parser
+ * @param state parser state
+ * @sa Clp_NewParserState, Clp_RestoreParser
+ */
void
-Clp_SaveParser(Clp_Parser *clp, Clp_ParserState *save)
- /* Saves parser position in save */
+Clp_SaveParser(const Clp_Parser *clp, Clp_ParserState *state)
{
Clp_Internal *cli = clp->internal;
- save->argv = cli->argv;
- save->argc = cli->argc;
- memcpy(save->option_chars, cli->option_chars, 3);
- save->text = cli->text;
- save->is_short = cli->is_short;
- save->whole_negated = cli->whole_negated;
+ state->argv = cli->argv;
+ state->argc = cli->argc;
+ memcpy(state->option_chars, cli->option_chars, Clp_OptionCharsSize);
+ state->xtext = cli->xtext;
+
+ state->option_processing = cli->option_processing;
+ state->opt_generation = cli->opt_generation;
+ state->current_option = cli->current_option;
+ state->is_short = cli->is_short;
+ state->whole_negated = cli->whole_negated;
+ state->current_short = cli->current_short;
+ state->negated_by_no = cli->negated_by_no;
}
+/** @param clp the parser
+ * @param state parser state
+ *
+ * The parser state in @a state is restored into @a clp. The next call to
+ * Clp_Next() will return the same result as it would have at the time @a
+ * state was saved (probably by Clp_SaveParser(@a clp, @a state)).
+ *
+ * A parser state contains information about arguments (argc and argv; see
+ * Clp_SetArguments()) and option processing (Clp_SetOptionProcessing()), but
+ * not about options (Clp_SetOptions()). Changes to options and value types
+ * are preserved across Clp_RestoreParser().
+ *
+ * @sa Clp_NewParserState, Clp_SaveParser
+ */
void
-Clp_RestoreParser(Clp_Parser *clp, Clp_ParserState *save)
- /* Restores parser position from save */
+Clp_RestoreParser(Clp_Parser *clp, const Clp_ParserState *state)
{
Clp_Internal *cli = clp->internal;
- cli->argv = save->argv;
- cli->argc = save->argc;
- memcpy(cli->option_chars, save->option_chars, 3);
- cli->text = save->text;
- cli->is_short = save->is_short;
- cli->whole_negated = save->whole_negated;
+ cli->argv = state->argv;
+ cli->argc = state->argc;
+ memcpy(cli->option_chars, state->option_chars, Clp_OptionCharsSize);
+ cli->xtext = state->xtext;
+ cli->option_processing = state->option_processing;
+ cli->is_short = state->is_short;
+ cli->whole_negated = state->whole_negated;
+ cli->current_short = state->current_short;
+ cli->negated_by_no = state->negated_by_no;
+ if (cli->opt_generation == state->opt_generation)
+ cli->current_option = state->current_option;
+ else
+ cli->current_option = -1;
}
@@ -955,23 +1503,33 @@ Clp_RestoreParser(Clp_Parser *clp, Clp_ParserState *save)
static void
set_option_text(Clp_Internal *cli, const char *text, int n_option_chars)
{
- char *option_chars = cli->option_chars;
- assert(n_option_chars < 3);
-
- while (n_option_chars-- > 0)
- *option_chars++ = *text++;
- *option_chars = 0;
-
- cli->text = text;
+ assert(n_option_chars < Clp_OptionCharsSize);
+ memcpy(cli->option_chars, text, n_option_chars);
+ cli->option_chars[n_option_chars] = 0;
+ cli->xtext = text + n_option_chars;
}
+static int
+get_oclass(Clp_Parser *clp, const char *text, int *ocharskip)
+{
+ int c;
+ if (clp->internal->utf8) {
+ char *s;
+ c = decode_utf8(text, &s);
+ *ocharskip = s - text;
+ } else {
+ c = (unsigned char) text[0];
+ *ocharskip = 1;
+ }
+ return Clp_OptionChar(clp, c);
+}
static int
next_argument(Clp_Parser *clp, int want_argument)
/* Moves clp to the next argument.
Returns 1 if it finds another option.
Returns 0 if there aren't any more arguments.
- Returns 0, sets clp->have_arg = 1, and sets clp->arg to the argument
+ Returns 0, sets clp->have_val = 1, and sets clp->vstr to the argument
if the next argument isn't an option.
If want_argument > 0, it'll look for an argument.
want_argument == 1: Accept arguments that start with Clp_NotOption
@@ -988,25 +1546,25 @@ next_argument(Clp_Parser *clp, int want_argument)
{
Clp_Internal *cli = clp->internal;
const char *text;
- int option_class;
+ int oclass, ocharskip;
/* clear relevant flags */
- clp->have_arg = 0;
- clp->arg = 0;
+ clp->have_val = 0;
+ clp->vstr = 0;
cli->could_be_short = 0;
/* if we're in a string of short options, move up one char in the string */
if (cli->is_short) {
- ++cli->text;
- if (cli->text[0] == 0)
+ cli->xtext += clp_utf8_charlen(cli, cli->xtext);
+ if (cli->xtext[0] == 0)
cli->is_short = 0;
else if (want_argument > 0) {
/* handle -O[=]argument case */
- clp->have_arg = 1;
- if (cli->text[0] == '=')
- clp->arg = cli->text + 1;
+ clp->have_val = 1;
+ if (cli->xtext[0] == '=')
+ clp->vstr = cli->xtext + 1;
else
- clp->arg = cli->text;
+ clp->vstr = cli->xtext;
cli->is_short = 0;
return 0;
}
@@ -1018,7 +1576,7 @@ next_argument(Clp_Parser *clp, int want_argument)
/** if not in short options, move to the next argument **/
cli->whole_negated = 0;
- cli->text = 0;
+ cli->xtext = 0;
if (cli->argc <= 1)
return 0;
@@ -1030,21 +1588,23 @@ next_argument(Clp_Parser *clp, int want_argument)
if (want_argument > 1)
goto not_option;
- option_class = cli->option_class[(unsigned char)text[0]];
- if (text[0] == '-' && text[1] == '-')
- option_class = Clp_DoubledLong;
+ if (text[0] == '-' && text[1] == '-') {
+ oclass = Clp_DoubledLong;
+ ocharskip = 2;
+ } else
+ oclass = get_oclass(clp, text, &ocharskip);
/* If this character could introduce either a short or a long option,
try a long option first, but remember that short's a possibility for
later. */
- if ((option_class & (Clp_Short | Clp_ShortNegated))
- && (option_class & (Clp_Long | Clp_LongNegated))) {
- option_class &= ~(Clp_Short | Clp_ShortNegated);
- if (text[1] != 0)
+ if ((oclass & (Clp_Short | Clp_ShortNegated))
+ && (oclass & (Clp_Long | Clp_LongNegated))) {
+ oclass &= ~(Clp_Short | Clp_ShortNegated);
+ if (text[ocharskip])
cli->could_be_short = 1;
}
- switch (option_class) {
+ switch (oclass) {
case Clp_Short:
cli->is_short = 1;
@@ -1065,9 +1625,9 @@ next_argument(Clp_Parser *clp, int want_argument)
check_singleton:
/* For options introduced with one character, option-char,
'[option-char]' alone is NOT an option. */
- if (text[1] == 0)
+ if (!text[ocharskip])
goto not_option;
- set_option_text(cli, text, 1);
+ set_option_text(cli, text, ocharskip);
break;
case Clp_LongImplicit:
@@ -1079,14 +1639,14 @@ next_argument(Clp_Parser *clp, int want_argument)
break;
case Clp_DoubledLong:
- set_option_text(cli, text, 2);
+ set_option_text(cli, text, ocharskip);
break;
not_option:
case Clp_NotOption:
cli->is_short = 0;
- clp->have_arg = 1;
- clp->arg = text;
+ clp->have_val = 1;
+ clp->vstr = text;
return 0;
default:
@@ -1103,31 +1663,32 @@ switch_to_short_argument(Clp_Parser *clp)
{
Clp_Internal *cli = clp->internal;
const char *text = cli->argv[0];
- int option_class = cli->option_class[(unsigned char)text[0]];
- cli->is_short = 1;
- cli->whole_negated = (option_class & Clp_ShortNegated ? 1 : 0);
- set_option_text(cli, cli->argv[0], 1);
+ int ocharskip, oclass = get_oclass(clp, text, &ocharskip);
assert(cli->could_be_short);
+ cli->is_short = 1;
+ cli->whole_negated = (oclass & Clp_ShortNegated ? 1 : 0);
+ set_option_text(cli, cli->argv[0], ocharskip);
}
-static Clp_Option *
+static int
find_long(Clp_Parser *clp, const char *arg)
/* If arg corresponds to one of clp's options, finds that option &
returns it. If any argument is given after an = sign in arg, sets
- clp->have_arg = 1 and clp->arg to that argument. Sets cli->ambiguous
+ clp->have_val = 1 and clp->vstr to that argument. Sets cli->ambiguous
to 1 iff there was no match because the argument was ambiguous. */
{
Clp_Internal *cli = clp->internal;
- int value, len, min_match;
- Clp_Option *opt = cli->opt;
+ int optno, len, lmm;
+ const Clp_Option *opt = cli->opt;
+ const Clp_InternOption *iopt;
int first_negative_ambiguous;
/* Look for a normal option. */
- value = find_prefix_opt
- (arg, cli->nopt, opt, cli->long_min_match,
- &cli->ambiguous, cli->ambiguous_values, clp->negated);
- if (value >= 0)
+ optno = find_prefix_opt
+ (clp, arg, cli->nopt, opt, cli->iopt,
+ &cli->ambiguous, cli->ambiguous_values);
+ if (optno >= 0)
goto worked;
/* If we can't find it, look for a negated option. */
@@ -1137,10 +1698,10 @@ find_long(Clp_Parser *clp, const char *arg)
while (arg[0] == 'n' && arg[1] == 'o' && arg[2] == '-') {
arg += 3;
clp->negated = !clp->negated;
- value = find_prefix_opt
- (arg, cli->nopt, opt, cli->long_min_match,
- &cli->ambiguous, cli->ambiguous_values, clp->negated);
- if (value >= 0)
+ optno = find_prefix_opt
+ (clp, arg, cli->nopt, opt, cli->iopt,
+ &cli->ambiguous, cli->ambiguous_values);
+ if (optno >= 0)
goto worked;
}
@@ -1152,186 +1713,233 @@ find_long(Clp_Parser *clp, const char *arg)
for (i = first_negative_ambiguous; i < max; i++)
cli->ambiguous_values[i] = -cli->ambiguous_values[i] - 1;
}
- return 0;
+ return -1;
worked:
- min_match = (clp->negated ? cli->long_min_match[value].neg : cli->long_min_match[value].pos);
- len = argcmp(opt[value].long_name, arg, min_match, 1); /* XXX 1? */
+ iopt = &cli->iopt[optno];
+ lmm = (clp->negated ? iopt->lmmneg : iopt->lmmpos);
+ if (cli->could_be_short
+ && (clp->negated ? iopt->lmmneg_short : iopt->lmmpos_short)) {
+ int first_charlen = clp_utf8_charlen(cli, arg);
+ lmm = (first_charlen >= lmm ? first_charlen + 1 : lmm);
+ }
+ len = argcmp(opt[optno].long_name + iopt->ilongoff, arg, lmm, 1);
assert(len > 0);
if (arg[len] == '=') {
- clp->have_arg = 1;
- clp->arg = arg + len + 1;
+ clp->have_val = 1;
+ clp->vstr = arg + len + 1;
}
- return &opt[value];
+ return optno;
}
-static Clp_Option *
-find_short(Clp_Parser *clp, int short_name)
+static int
+find_short(Clp_Parser *clp, const char *text)
/* If short_name corresponds to one of clp's options, returns it. */
{
Clp_Internal *cli = clp->internal;
- Clp_Option *opt = cli->opt;
- int i;
+ const Clp_Option *opt = cli->opt;
+ const Clp_InternOption *iopt = cli->iopt;
+ int i, c;
+ if (clp->internal->utf8)
+ c = decode_utf8(text, 0);
+ else
+ c = (unsigned char) *text;
for (i = 0; i < cli->nopt; i++)
- if (opt[i].short_name == short_name
- && (clp->negated
- ? TEST(&opt[i], Clp_Negate)
- : !TEST(&opt[i], Clp_OnlyNegated)))
- return &opt[i];
-
- return 0;
+ if (iopt[i].ishort && opt[i].short_name == c
+ && (clp->negated ? iopt[i].ineg : iopt[i].ipos))
+ return i;
+
+ return -1;
}
+/** @param clp the parser
+ * @return option ID of next option
+ *
+ * Parse the next argument from the argument list, store information about
+ * that argument in the fields of @a clp, and return the option's ID.
+ *
+ * If an argument was successfully parsed, that option's ID is returned.
+ * Other possible return values are:
+ *
+ * <dl>
+ * <dt>Clp_Done</dt>
+ * <dd>There are no more arguments.</dd>
+ * <dt>Clp_NotOption</dt>
+ * <dd>The next argument was not an option. The argument's text is @a
+ * clp->vstr (and @a clp->val.s).</dd>
+ * <dt>Clp_BadOption</dt>
+ * <dd>The next argument was a bad option: either an option that wasn't
+ * understood, or an option lacking a required value, or an option whose value
+ * couldn't be parsed. The option has been skipped.</dd>
+ * <dt>Clp_Error</dt>
+ * <dd>There was an internal error. This should never occur unless a user
+ * messes with, for example, a Clp_Option array.</dd>
+ * </dl>
+ *
+ * The fields of @a clp are set as follows.
+ *
+ * <dl>
+ * <dt><tt>negated</tt></dt>
+ * <dd>1 if the option was negated, 0 if it wasn't.</dd>
+ * <dt><tt>have_val</tt></dt>
+ * <dd>1 if the option had a value, 0 if it didn't. Note that negated options
+ * are not allowed to have values.</dd>
+ * <dt><tt>vstr</tt></dt>
+ * <dd>The value string, if any. NULL if there was no value.</dd>
+ * <dt><tt>val</tt></dt>
+ * <dd>An option's value type will parse the value string into this
+ * union.</dd>
+ * </dl>
+ *
+ * The parsed argument is shifted off the argument list, so that sequential
+ * calls to Clp_Next() step through the arugment list.
+ */
int
Clp_Next(Clp_Parser *clp)
- /* Gets and parses the next argument from the argument list.
-
- If there are no more arguments, returns Clp_Done.
- If the next argument isn't an option, returns Clp_NotOption;
- the argument is stored in clp->arg.
- If the next argument is an option, returns that option's option_id.
-
- If the next argument is an unrecognizable or ambiguous option,
- an error message is given and Clp_BadOption is returned.
-
- If an option has an argument, that argument is stored in clp->arg
- and clp->have_arg is set to 1.
- Furthermore, that argument's parsed value (according to its type)
- is stored in the clp->val union.
-
- If an option needs an argument but isn't given one;
- if it doesn't need an argument but IS given one;
- or if the argument is the wrong type,
- an error message is given and Clp_BadOption is returned. */
{
Clp_Internal *cli = clp->internal;
- Clp_Option *opt;
+ int optno;
+ const Clp_Option *opt;
Clp_ParserState clpsave;
- int complain;
+ int vtpos, complain;
- /** Set up clp **/
- cli->current_option = 0;
+ /* Set up clp */
+ cli->current_option = -1;
cli->ambiguous = 0;
- /** Get the next argument or option **/
- if (!next_argument(clp, cli->option_processing ? 0 : 2))
- return clp->have_arg ? Clp_NotOption : Clp_Done;
+ /* Get the next argument or option */
+ if (!next_argument(clp, cli->option_processing ? 0 : 2)) {
+ clp->val.s = clp->vstr;
+ return clp->have_val ? Clp_NotOption : Clp_Done;
+ }
clp->negated = cli->whole_negated;
if (cli->is_short)
- opt = find_short(clp, cli->text[0]);
+ optno = find_short(clp, cli->xtext);
else
- opt = find_long(clp, cli->text);
+ optno = find_long(clp, cli->xtext);
- /** If there's ambiguity between long & short options, and we couldn't
- find a long option, look for a short option **/
- if (!opt && cli->could_be_short) {
+ /* If there's ambiguity between long & short options, and we couldn't
+ find a long option, look for a short option */
+ if (optno < 0 && cli->could_be_short) {
switch_to_short_argument(clp);
- opt = find_short(clp, cli->text[0]);
+ optno = find_short(clp, cli->xtext);
}
-
- /** If we didn't find an option... **/
- if (!opt || (clp->negated && !TEST(opt, Clp_Negate))) {
-
+
+ /* If we didn't find an option... */
+ if (optno < 0 || (clp->negated && !cli->iopt[optno].ineg)) {
/* default processing for the "--" option: turn off option processing
and return the next argument */
if (strcmp(cli->argv[0], "--") == 0) {
Clp_SetOptionProcessing(clp, 0);
return Clp_Next(clp);
}
-
+
/* otherwise, report some error or other */
if (cli->ambiguous)
ambiguity_error(clp, cli->ambiguous, cli->ambiguous_values,
- cli->opt, cli->option_chars,
- "option '%s%s' is ambiguous",
- cli->option_chars, cli->text);
+ cli->opt, cli->iopt, cli->option_chars,
+ "option %`%s%s%' is ambiguous",
+ cli->option_chars, cli->xtext);
else if (cli->is_short && !cli->could_be_short)
- Clp_OptionError(clp, "unrecognized option '%s%c'",
- cli->option_chars, cli->text[0]);
+ Clp_OptionError(clp, "unrecognized option %`%s%C%'",
+ cli->option_chars, cli->xtext);
else
- Clp_OptionError(clp, "unrecognized option '%s%s'",
- cli->option_chars, cli->text);
+ Clp_OptionError(clp, "unrecognized option %`%s%s%'",
+ cli->option_chars, cli->xtext);
+
return Clp_BadOption;
}
- /** Set the current option **/
- cli->current_option = opt;
+ /* Set the current option */
+ cli->current_option = optno;
cli->current_short = cli->is_short;
cli->negated_by_no = clp->negated && !cli->whole_negated;
- /** The no-argument (or should-have-no-argument) case **/
- if (clp->negated || !TEST(opt, Clp_AnyArgument)) {
- if (clp->have_arg) {
- Clp_OptionError(clp, "'%O' can't take an argument");
+ /* The no-argument (or should-have-no-argument) case */
+ if (clp->negated
+ || (!cli->iopt[optno].imandatory && !cli->iopt[optno].ioptional)) {
+ if (clp->have_val) {
+ Clp_OptionError(clp, "%`%O%' can't take an argument");
return Clp_BadOption;
} else
- return opt->option_id;
+ return cli->opt[optno].option_id;
}
- /** Get an argument if we need one, or if it's optional **/
+ /* Get an argument if we need one, or if it's optional */
/* Sanity-check the argument type. */
- if (opt->arg_type <= 0 || opt->arg_type >= cli->nargtype
- || cli->argtype[ opt->arg_type ].func == 0)
+ opt = &cli->opt[optno];
+ if (opt->val_type <= 0)
+ return Clp_Error;
+ vtpos = val_type_binsearch(cli, opt->val_type);
+ if (vtpos == cli->nvaltype || cli->valtype[vtpos].val_type != opt->val_type)
return Clp_Error;
/* complain == 1 only if the argument was explicitly given,
or it is mandatory. */
- complain = (clp->have_arg != 0) || TEST(opt, Clp_Mandatory);
+ complain = (clp->have_val != 0) || cli->iopt[optno].imandatory;
Clp_SaveParser(clp, &clpsave);
- if (TEST(opt, Clp_Mandatory) && !clp->have_arg) {
+ if (cli->iopt[optno].imandatory && !clp->have_val) {
/* Mandatory argument case */
/* Allow arguments to options to start with a dash, but only if the
argument type allows it by not setting Clp_DisallowOptions */
- int disallow = TEST(&cli->argtype[opt->arg_type], Clp_DisallowOptions);
+ int disallow = (cli->valtype[vtpos].flags & Clp_DisallowOptions) != 0;
next_argument(clp, disallow ? 1 : 2);
- if (!clp->have_arg) {
- int got_option = cli->text != 0;
+ if (!clp->have_val) {
+ int got_option = cli->xtext != 0;
Clp_RestoreParser(clp, &clpsave);
if (got_option)
- Clp_OptionError(clp, "'%O' requires a non-option argument");
+ Clp_OptionError(clp, "%`%O%' requires a non-option argument");
else
- Clp_OptionError(clp, "'%O' requires an argument");
+ Clp_OptionError(clp, "%`%O%' requires an argument");
return Clp_BadOption;
}
- } else if (cli->is_short && !clp->have_arg && cli->text[1] != 0)
+ } else if (cli->is_short && !clp->have_val
+ && cli->xtext[clp_utf8_charlen(cli, cli->xtext)])
/* The -[option]argument case:
Assume that the rest of the current string is the argument. */
next_argument(clp, 1);
- /** Parse the argument **/
- if (clp->have_arg) {
- Clp_ArgType *atr = &cli->argtype[ opt->arg_type ];
- if (atr->func(clp, clp->arg, complain, atr->thunk) <= 0) {
+ /* Parse the argument */
+ if (clp->have_val) {
+ Clp_ValType *atr = &cli->valtype[vtpos];
+ if (atr->func(clp, clp->vstr, complain, atr->user_data) <= 0) {
/* parser failed */
- clp->have_arg = 0;
- if (TEST(opt, Clp_Mandatory))
+ clp->have_val = 0;
+ if (cli->iopt[optno].imandatory)
return Clp_BadOption;
else
Clp_RestoreParser(clp, &clpsave);
}
}
-
+
return opt->option_id;
}
+/** @param clp the parser
+ * @param allow_options whether options will be allowed
+ *
+ * Remove and return the next argument from @a clp's argument array. If there
+ * are no arguments left, or if the next argument is an option and @a
+ * allow_options != 0, then returns null.
+ */
const char *
-Clp_Shift(Clp_Parser *clp, int allow_dashes)
+Clp_Shift(Clp_Parser *clp, int allow_options)
/* Returns the next argument from the argument list without parsing it.
If there are no more arguments, returns 0. */
{
Clp_ParserState clpsave;
Clp_SaveParser(clp, &clpsave);
- next_argument(clp, allow_dashes ? 2 : 1);
- if (!clp->have_arg)
+ next_argument(clp, allow_options ? 2 : 1);
+ if (!clp->have_val)
Clp_RestoreParser(clp, &clpsave);
- return clp->arg;
+ return clp->vstr;
}
@@ -1409,52 +2017,64 @@ append_build_string(Clp_BuildString *bs, const char *s, int l)
static Clp_BuildString *
Clp_VaOptionError(Clp_Parser *clp, Clp_BuildString *bs,
const char *fmt, va_list val)
- /* Reports an error for parser clp. Allowable % format characters are:
-
- s Print a string from the argument list.
- c Print an int from the argument list as a character.
- d Print an int from the argument list.
- O Print the name of the current option;
- take nothing from the argument list.
-
- No field specifications or flags are allowed. Always returns 0. */
{
Clp_Internal *cli = clp->internal;
const char *percent;
+ int c;
if (!bs)
bs = new_build_string();
if (!bs)
return 0;
- append_build_string(bs, cli->program_name, -1);
- append_build_string(bs, ": ", 2);
+ if (cli->program_name && cli->program_name[0]) {
+ append_build_string(bs, cli->program_name, -1);
+ append_build_string(bs, ": ", 2);
+ }
for (percent = strchr(fmt, '%'); percent; percent = strchr(fmt, '%')) {
append_build_string(bs, fmt, percent - fmt);
switch (*++percent) {
case 's': {
- char *s = va_arg(val, char *);
- if (s) append_build_string(bs, s, -1);
- else append_build_string(bs, "(null)", 6);
+ const char *s = va_arg(val, const char *);
+ if (s)
+ append_build_string(bs, s, -1);
+ else
+ append_build_string(bs, "(null)", 6);
break;
}
-
- case 'c': {
- int c = va_arg(val, int);
- if (ENSURE_BUILD_STRING(bs, 4)) {
- if (c >= 32 && c <= 126)
- *bs->pos++ = c;
- else if (c < 32) {
- *bs->pos++ = '^';
- *bs->pos++ = c + 64;
- } else {
- sprintf(bs->pos, "\\%03o", c);
- bs->pos += 4;
- }
- }
- break;
+
+ case 'C': {
+ const char *s = va_arg(val, const char *);
+ if (cli->utf8)
+ c = decode_utf8(s, 0);
+ else
+ c = (unsigned char) *s;
+ goto char_c;
}
+
+ case 'c':
+ c = va_arg(val, int);
+ goto char_c;
+
+ char_c:
+ if (ENSURE_BUILD_STRING(bs, 4)) {
+ if (c >= 32 && c <= 126)
+ *bs->pos++ = c;
+ else if (c < 32) {
+ *bs->pos++ = '^';
+ *bs->pos++ = c + 64;
+ } else if (cli->utf8 && c >= 127 && c < 0x110000) {
+ bs->pos = encode_utf8(bs->pos, 4, c);
+ } else if (c >= 127 && c <= 255) {
+ sprintf(bs->pos, "\\%03o", c & 0xFF);
+ bs->pos += 4;
+ } else {
+ *bs->pos++ = '\\';
+ *bs->pos++ = '?';
+ }
+ }
+ break;
case 'd': {
int d = va_arg(val, int);
@@ -1466,20 +2086,25 @@ Clp_VaOptionError(Clp_Parser *clp, Clp_BuildString *bs,
}
case 'O': {
- Clp_Option *opt = cli->current_option;
- if (!opt)
+ int optno = cli->current_option;
+ const Clp_Option *opt = &cli->opt[optno];
+ if (optno < 0)
append_build_string(bs, "(no current option!)", -1);
else if (cli->current_short) {
append_build_string(bs, cli->option_chars, -1);
- if (ENSURE_BUILD_STRING(bs, 1))
- *bs->pos++ = opt->short_name;
+ if (ENSURE_BUILD_STRING(bs, 5)) {
+ if (cli->utf8)
+ bs->pos = encode_utf8(bs->pos, 5, opt->short_name);
+ else
+ *bs->pos++ = opt->short_name;
+ }
} else if (cli->negated_by_no) {
append_build_string(bs, cli->option_chars, -1);
append_build_string(bs, "no-", 3);
- append_build_string(bs, opt->long_name, -1);
+ append_build_string(bs, opt->long_name + cli->iopt[optno].ilongoff, -1);
} else {
append_build_string(bs, cli->option_chars, -1);
- append_build_string(bs, opt->long_name, -1);
+ append_build_string(bs, opt->long_name + cli->iopt[optno].ilongoff, -1);
}
break;
}
@@ -1488,6 +2113,14 @@ Clp_VaOptionError(Clp_Parser *clp, Clp_BuildString *bs,
if (ENSURE_BUILD_STRING(bs, 1))
*bs->pos++ = '%';
break;
+
+ case '`':
+ append_build_string(bs, (cli->utf8 ? "\342\200\230" : "'"), -1);
+ break;
+
+ case '\'':
+ append_build_string(bs, (cli->utf8 ? "\342\200\231" : "'"), -1);
+ break;
default:
if (ENSURE_BUILD_STRING(bs, 2)) {
@@ -1517,18 +2150,59 @@ do_error(Clp_Parser *clp, Clp_BuildString *bs)
text = "out of memory\n";
if (clp->internal->error_handler != 0)
- (*clp->internal->error_handler)(text);
+ (*clp->internal->error_handler)(clp, text);
else
fputs(text, stderr);
}
+/** @param clp the parser
+ * @param format error format
+ *
+ * Format an error message from @a format and any additional arguments in the
+ * ellipsis. The resulting error string by printing it to standard error or
+ * passing it to Clp_SetErrorHandler.
+ *
+ * The following format characters are accepted:
+ *
+ * <dl>
+ * <dt><tt>%</tt><tt>c</tt></dt>
+ * <dd>A character (type <tt>int</tt>). Control characters are printed in
+ * caret notation. If the parser is in UTF-8 mode, the character is formatted
+ * in UTF-8. Otherwise, special characters are printed with backslashes and
+ * octal notation.</dd>
+ * <dt><tt>%</tt><tt>s</tt></dt>
+ * <dd>A string (type <tt>const char *</tt>).</dd>
+ * <dt><tt>%</tt><tt>C</tt></dt>
+ * <dd>The argument is a string (type <tt>const char *</tt>). The first
+ * character in this string is printed. If the parser is in UTF-8 mode, this
+ * may involve multiple bytes.</dd>
+ * <dt><tt>%</tt><tt>d</tt></dt>
+ * <dd>An integer (type <tt>int</tt>). Printed in decimal.</dd>
+ * <dt><tt>%</tt><tt>O</tt></dt>
+ * <dd>The current option. No values are read from the argument list; the
+ * current option is defined in the Clp_Parser object itself.</dd>
+ * <dt><tt>%%</tt></dt>
+ * <dd>Prints a percent character.</dd>
+ * <dt><tt>%</tt><tt>`</tt></dt>
+ * <dd>In UTF-8 mode, prints a left single quote. Otherwise prints a single
+ * quote.</dd>
+ * <dt><tt>%</tt><tt>'</tt></dt>
+ * <dd>In UTF-8 mode, prints a right single quote. Otherwise prints a single
+ * quote.</dd>
+ * </dl>
+ *
+ * Note that no flag characters, precision, or field width characters are
+ * currently supported.
+ *
+ * @sa Clp_SetErrorHandler
+ */
int
-Clp_OptionError(Clp_Parser *clp, const char *fmt, ...)
+Clp_OptionError(Clp_Parser *clp, const char *format, ...)
{
Clp_BuildString *bs;
va_list val;
- va_start(val, fmt);
- bs = Clp_VaOptionError(clp, 0, fmt, val);
+ va_start(val, format);
+ bs = Clp_VaOptionError(clp, 0, format, val);
va_end(val);
do_error(clp, bs);
free_build_string(bs);
@@ -1537,9 +2211,10 @@ Clp_OptionError(Clp_Parser *clp, const char *fmt, ...)
static int
ambiguity_error(Clp_Parser *clp, int ambiguous, int *ambiguous_values,
- Clp_Option *opt, const char *prefix,
- const char *fmt, ...)
+ const Clp_Option *opt, const Clp_InternOption *iopt,
+ const char *prefix, const char *fmt, ...)
{
+ Clp_Internal *cli = clp->internal;
Clp_BuildString *bs;
int i;
va_list val;
@@ -1547,8 +2222,11 @@ ambiguity_error(Clp_Parser *clp, int ambiguous, int *ambiguous_values,
bs = Clp_VaOptionError(clp, 0, fmt, val);
if (!bs) goto done;
- append_build_string(bs, clp->internal->program_name, -1);
- append_build_string(bs, ": (Possibilities are", -1);
+ if (clp->internal->program_name && clp->internal->program_name[0]) {
+ append_build_string(bs, clp->internal->program_name, -1);
+ append_build_string(bs, ": ", 2);
+ }
+ append_build_string(bs, "(Possibilities are", -1);
for (i = 0; i < ambiguous && i < MAX_AMBIGUOUS_VALUES; i++) {
int value = ambiguous_values[i];
@@ -1561,9 +2239,11 @@ ambiguity_error(Clp_Parser *clp, int ambiguous, int *ambiguous_values,
append_build_string(bs, (i == 1 ? " and " : ", and "), -1);
else
append_build_string(bs, ", ", 2);
+ append_build_string(bs, (cli->utf8 ? "\342\200\230" : "'"), -1);
append_build_string(bs, prefix, -1);
append_build_string(bs, no_dash, -1);
- append_build_string(bs, opt[value].long_name, -1);
+ append_build_string(bs, opt[value].long_name + iopt[value].ilongoff, -1);
+ append_build_string(bs, (cli->utf8 ? "\342\200\231" : "'"), -1);
}
if (ambiguous > MAX_AMBIGUOUS_VALUES)
@@ -1587,30 +2267,56 @@ copy_string(char *buf, int buflen, int bufpos, const char *what)
return l;
}
+/** @param clp the parser
+ * @param buf output buffer
+ * @param len length of output buffer
+ * @return number of characters written to the buffer, not including the terminating NUL
+ *
+ * A string that looks like the last option parsed by @a clp is extracted into
+ * @a buf. The correct option characters are put into the string first,
+ * followed by the option text. The output buffer is null-terminated unless
+ * @a len == 0.
+ *
+ * @sa Clp_CurOptionName
+ */
int
-Clp_CurOptionNameBuf(Clp_Parser *clp, char *buf, int buflen)
+Clp_CurOptionNameBuf(Clp_Parser *clp, char *buf, int len)
{
Clp_Internal *cli = clp->internal;
- Clp_Option *opt = cli->current_option;
+ int optno = cli->current_option;
int pos = 0;
- if (!opt)
- pos += copy_string(buf, buflen, pos, "(no current option!)");
+ if (optno < 0)
+ pos += copy_string(buf, len, pos, "(no current option!)");
else if (cli->current_short) {
- pos += copy_string(buf, buflen, pos, cli->option_chars);
- if (pos < buflen - 1)
- buf[pos++] = opt->short_name;
+ pos += copy_string(buf, len, pos, cli->option_chars);
+ if (cli->utf8)
+ pos = (encode_utf8(buf + pos, len - pos - 1, cli->opt[optno].short_name) - buf);
+ else if (pos < len - 1)
+ buf[pos++] = cli->opt[optno].short_name;
} else if (cli->negated_by_no) {
- pos += copy_string(buf, buflen, pos, cli->option_chars);
- pos += copy_string(buf, buflen, pos, "no-");
- pos += copy_string(buf, buflen, pos, opt->long_name);
+ pos += copy_string(buf, len, pos, cli->option_chars);
+ pos += copy_string(buf, len, pos, "no-");
+ pos += copy_string(buf, len, pos, cli->opt[optno].long_name + cli->iopt[optno].ilongoff);
} else {
- pos += copy_string(buf, buflen, pos, cli->option_chars);
- pos += copy_string(buf, buflen, pos, opt->long_name);
+ pos += copy_string(buf, len, pos, cli->option_chars);
+ pos += copy_string(buf, len, pos, cli->opt[optno].long_name + cli->iopt[optno].ilongoff);
}
- buf[pos] = 0;
+ if (pos < len)
+ buf[pos] = 0;
return pos;
}
+/** @param clp the parser
+ * @return string describing the current option
+ *
+ * This function acts like Clp_CurOptionNameBuf(), but returns a pointer into
+ * a static buffer that will be rewritten on the next call to
+ * Clp_CurOptionName().
+ *
+ * @note This function is not thread safe.
+ *
+ * @sa Clp_CurOptionName
+ */
const char *
Clp_CurOptionName(Clp_Parser *clp)
{
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c
index 85b13251fd4..5d0b831c613 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c
@@ -53,7 +53,7 @@ good_strtod(const char *nptr, char **endptr)
{
double d = strtod(nptr, endptr);
if (endptr)
- while (*endptr > nptr && isspace((*endptr)[-1]))
+ while (*endptr > nptr && isspace((unsigned char) (*endptr)[-1]))
(*endptr)--;
return d;
}
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
index 1f4020cfce4..9c9217358b5 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc
@@ -181,10 +181,10 @@ StringAccum::append_break_lines(const String& text, int linelen, const String &l
linelen -= leftmargin.length();
for (const char* s = line; s < ends; s++) {
const char* start = s;
- while (s < ends && isspace(*s))
+ while (s < ends && isspace((unsigned char) *s))
s++;
const char* word = s;
- while (s < ends && !isspace(*s))
+ while (s < ends && !isspace((unsigned char) *s))
s++;
if (s - line > linelen && start > line) {
*this << leftmargin;
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/liblcdf/string.cc
index 8bcf1596304..9f3c27e07c6 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/string.cc
+++ b/Build/source/texk/lcdf-typetools/liblcdf/string.cc
@@ -375,7 +375,7 @@ hard_lower(const String &s, int pos)
char *x = const_cast<char *>(new_s.data()); // know it's mutable
int len = s.length();
for (; pos < len; pos++)
- x[pos] = tolower(x[pos]);
+ x[pos] = tolower((unsigned char) x[pos]);
return new_s;
}
@@ -396,7 +396,7 @@ hard_upper(const String &s, int pos)
char *x = const_cast<char *>(new_s.data()); // know it's mutable
int len = s.length();
for (; pos < len; pos++)
- x[pos] = toupper(x[pos]);
+ x[pos] = toupper((unsigned char) x[pos]);
return new_s;
}
diff --git a/Build/source/texk/lcdf-typetools/missing b/Build/source/texk/lcdf-typetools/missing
index 894e786e16c..1c8ff7049d8 100755
--- a/Build/source/texk/lcdf-typetools/missing
+++ b/Build/source/texk/lcdf-typetools/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -33,6 +33,8 @@ if test $# -eq 0; then
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@ fi
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg. You should only need it if
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg. You should only need it if
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg. You should only need it if
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
index 7fc3afae05c..8664b398f9d 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_mmafm_OBJECTS = main.$(OBJEXT)
mmafm_OBJECTS = $(am_mmafm_OBJECTS)
mmafm_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -67,8 +63,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -92,6 +86,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +100,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,14 +117,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -137,24 +130,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = mmafm.1
mmafm_SOURCES = main.cc
@@ -197,7 +201,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -220,7 +224,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mmafm$(EXEEXT): $(mmafm_OBJECTS) $(mmafm_DEPENDENCIES)
@rm -f mmafm$(EXEEXT)
- $(CXXLINK) $(mmafm_LDFLAGS) $(mmafm_OBJECTS) $(mmafm_LDADD) $(LIBS)
+ $(CXXLINK) $(mmafm_OBJECTS) $(mmafm_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -231,22 +235,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -339,22 +342,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -370,7 +372,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -419,12 +421,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -444,21 +454,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/mmafm/main.cc b/Build/source/texk/lcdf-typetools/mmafm/main.cc
index 8c04fecf160..b58480e72c7 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/main.cc
+++ b/Build/source/texk/lcdf-typetools/mmafm/main.cc
@@ -44,22 +44,22 @@
#define PRECISION_OPT 311
#define KERN_PREC_OPT 312
-Clp_Option options[] = {
- { "1", '1', N1_OPT, Clp_ArgDouble, 0 },
- { "2", '2', N2_OPT, Clp_ArgDouble, 0 },
- { "3", '3', N3_OPT, Clp_ArgDouble, 0 },
- { "4", '4', N4_OPT, Clp_ArgDouble, 0 },
- { "weight", 'w', WEIGHT_OPT, Clp_ArgDouble, 0 },
- { "width", 'W', WIDTH_OPT, Clp_ArgDouble, 0 },
- { "optical-size", 'O', OPSIZE_OPT, Clp_ArgDouble, 0 },
- { "style", 0, STYLE_OPT, Clp_ArgDouble, 0 },
- { "wt", 0, WEIGHT_OPT, Clp_ArgDouble, 0 },
- { "wd", 0, WIDTH_OPT, Clp_ArgDouble, 0 },
- { "min-kern", 'k', KERN_PREC_OPT, Clp_ArgDouble, 0 },
- { "minimum-kern", 'k', KERN_PREC_OPT, Clp_ArgDouble, 0 },
- { "kern-precision", 'k', KERN_PREC_OPT, Clp_ArgDouble, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
- { "precision", 'p', PRECISION_OPT, Clp_ArgInt, 0 },
+const Clp_Option options[] = {
+ { "1", '1', N1_OPT, Clp_ValDouble, 0 },
+ { "2", '2', N2_OPT, Clp_ValDouble, 0 },
+ { "3", '3', N3_OPT, Clp_ValDouble, 0 },
+ { "4", '4', N4_OPT, Clp_ValDouble, 0 },
+ { "weight", 'w', WEIGHT_OPT, Clp_ValDouble, 0 },
+ { "width", 'W', WIDTH_OPT, Clp_ValDouble, 0 },
+ { "optical-size", 'O', OPSIZE_OPT, Clp_ValDouble, 0 },
+ { "style", 0, STYLE_OPT, Clp_ValDouble, 0 },
+ { "wt", 0, WEIGHT_OPT, Clp_ValDouble, 0 },
+ { "wd", 0, WIDTH_OPT, Clp_ValDouble, 0 },
+ { "min-kern", 'k', KERN_PREC_OPT, Clp_ValDouble, 0 },
+ { "minimum-kern", 'k', KERN_PREC_OPT, Clp_ValDouble, 0 },
+ { "kern-precision", 'k', KERN_PREC_OPT, Clp_ValDouble, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
+ { "precision", 'p', PRECISION_OPT, Clp_ValInt, 0 },
{ "version", 'v', VERSION_OPT, 0, 0 },
{ "help", 'h', HELP_OPT, 0, 0 },
};
@@ -305,12 +305,12 @@ main(int argc, char *argv[])
case OUTPUT_OPT:
if (output_file) errh->fatal("output file already specified");
- if (strcmp(clp->arg, "-") == 0)
+ if (strcmp(clp->vstr, "-") == 0)
output_file = stdout;
else {
- output_file = fopen(clp->arg, "wb");
+ output_file = fopen(clp->vstr, "wb");
if (!output_file)
- errh->fatal("%s: %s", clp->arg, strerror(errno));
+ errh->fatal("%s: %s", clp->vstr, strerror(errno));
}
break;
@@ -329,7 +329,7 @@ particular purpose.\n");
break;
case Clp_NotOption:
- read_file(clp->arg, finder);
+ read_file(clp->vstr, finder);
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
index 780e1b6d2a4..c56e333a0d5 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
+++ b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
index 764d39a37e9..e15821f5727 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -51,7 +47,7 @@ am_mmpfb_OBJECTS = myfont.$(OBJEXT) main.$(OBJEXT) \
t1minimize.$(OBJEXT) t1rewrit.$(OBJEXT)
mmpfb_OBJECTS = $(am_mmpfb_OBJECTS)
mmpfb_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -72,8 +68,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -97,6 +91,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -109,9 +105,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -127,14 +122,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -142,24 +135,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = mmpfb.1
mmpfb_SOURCES = myfont.cc myfont.hh \
@@ -206,7 +210,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -229,7 +233,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
mmpfb$(EXEEXT): $(mmpfb_OBJECTS) $(mmpfb_DEPENDENCIES)
@rm -f mmpfb$(EXEEXT)
- $(CXXLINK) $(mmpfb_LDFLAGS) $(mmpfb_OBJECTS) $(mmpfb_LDADD) $(LIBS)
+ $(CXXLINK) $(mmpfb_OBJECTS) $(mmpfb_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -243,22 +247,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1rewrit.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -351,22 +354,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -382,7 +384,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -431,12 +433,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -456,21 +466,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/main.cc b/Build/source/texk/lcdf-typetools/mmpfb/main.cc
index b323882ecbd..fe7f9f721a7 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/main.cc
+++ b/Build/source/texk/lcdf-typetools/mmpfb/main.cc
@@ -55,27 +55,27 @@
#define SUBRS_OPT 316
#define MINIMIZE_OPT 317
-Clp_Option options[] = {
- { "1", '1', N1_OPT, Clp_ArgDouble, 0 },
- { "2", '2', N2_OPT, Clp_ArgDouble, 0 },
- { "3", '3', N3_OPT, Clp_ArgDouble, 0 },
- { "4", '4', N4_OPT, Clp_ArgDouble, 0 },
+const Clp_Option options[] = {
+ { "1", '1', N1_OPT, Clp_ValDouble, 0 },
+ { "2", '2', N2_OPT, Clp_ValDouble, 0 },
+ { "3", '3', N3_OPT, Clp_ValDouble, 0 },
+ { "4", '4', N4_OPT, Clp_ValDouble, 0 },
{ "amcp-info", 0, AMCP_INFO_OPT, 0, 0 },
{ "help", 'h', HELP_OPT, 0, 0 },
{ "minimize", 'm', MINIMIZE_OPT, 0, Clp_Negate },
- { "optical-size", 'O', OPSIZE_OPT, Clp_ArgDouble, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "optical-size", 'O', OPSIZE_OPT, Clp_ValDouble, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "pfa", 'a', PFA_OPT, 0, 0 },
{ "pfb", 'b', PFB_OPT, 0, 0 },
- { "precision", 'p', PRECISION_OPT, Clp_ArgUnsigned, 0 },
+ { "precision", 'p', PRECISION_OPT, Clp_ValUnsigned, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
- { "style", 0, STYLE_OPT, Clp_ArgDouble, 0 },
- { "subrs", 0, SUBRS_OPT, Clp_ArgInt, Clp_Negate },
+ { "style", 0, STYLE_OPT, Clp_ValDouble, 0 },
+ { "subrs", 0, SUBRS_OPT, Clp_ValInt, Clp_Negate },
{ "version", 'v', VERSION_OPT, 0, 0 },
- { "wd", 0, WIDTH_OPT, Clp_ArgDouble, 0 },
- { "weight", 'w', WEIGHT_OPT, Clp_ArgDouble, 0 },
- { "width", 'W', WIDTH_OPT, Clp_ArgDouble, 0 },
- { "wt", 0, WEIGHT_OPT, Clp_ArgDouble, 0 },
+ { "wd", 0, WIDTH_OPT, Clp_ValDouble, 0 },
+ { "weight", 'w', WEIGHT_OPT, Clp_ValDouble, 0 },
+ { "width", 'W', WIDTH_OPT, Clp_ValDouble, 0 },
+ { "wt", 0, WEIGHT_OPT, Clp_ValDouble, 0 },
};
using namespace Efont;
@@ -343,12 +343,12 @@ main(int argc, char *argv[])
case OUTPUT_OPT:
if (outfile) errh->fatal("output file already specified");
- if (strcmp(clp->arg, "-") == 0)
+ if (strcmp(clp->vstr, "-") == 0)
outfile = stdout;
else {
- outfile = fopen(clp->arg, "wb");
+ outfile = fopen(clp->vstr, "wb");
if (!outfile)
- errh->fatal("%s: %s", clp->arg, strerror(errno));
+ errh->fatal("%s: %s", clp->vstr, strerror(errno));
}
break;
@@ -367,7 +367,7 @@ particular purpose.\n");
break;
case Clp_NotOption:
- do_file(clp->arg, psres);
+ do_file(clp->vstr, psres);
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
index 6cba4d26d3a..9d4cc1be988 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
+++ b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
index 72bab8988ed..f55051dc67c 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -49,7 +45,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_otfinfo_OBJECTS = otfinfo.$(OBJEXT)
otfinfo_OBJECTS = $(am_otfinfo_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -66,8 +62,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -91,6 +85,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -103,9 +99,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -121,14 +116,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -136,24 +129,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = otfinfo.1
otfinfo_SOURCES = \
@@ -199,7 +203,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -222,7 +226,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
otfinfo$(EXEEXT): $(otfinfo_OBJECTS) $(otfinfo_DEPENDENCIES)
@rm -f otfinfo$(EXEEXT)
- $(CXXLINK) $(otfinfo_LDFLAGS) $(otfinfo_OBJECTS) $(otfinfo_LDADD) $(LIBS)
+ $(CXXLINK) $(otfinfo_OBJECTS) $(otfinfo_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -233,22 +237,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otfinfo.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -341,22 +344,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -372,7 +374,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -421,12 +423,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -446,21 +456,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
index 5a266eba944..9bef7bc8f1f 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
+++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
index c76321b117e..82545acec04 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
+++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.cc
@@ -55,9 +55,9 @@ using namespace Efont;
#define QUERY_FAMILY_OPT 327
#define INFO_OPT 328
-Clp_Option options[] = {
+const Clp_Option options[] = {
- { "script", 0, SCRIPT_OPT, Clp_ArgString, 0 },
+ { "script", 0, SCRIPT_OPT, Clp_ValString, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
{ "verbose", 'V', VERBOSE_OPT, 0, Clp_Negate },
{ "features", 'f', QUERY_FEATURES_OPT, 0, 0 },
@@ -464,7 +464,7 @@ main(int argc, char *argv[])
case SCRIPT_OPT: {
if (!script.null())
usage_error(errh, "--script already specified");
- String arg = clp->arg;
+ String arg = clp->vstr;
int period = arg.find_left('.');
OpenType::Tag scr(period <= 0 ? arg : arg.substring(0, period));
if (scr.valid() && period > 0) {
@@ -521,7 +521,7 @@ particular purpose.\n");
break;
case Clp_NotOption:
- input_files.push_back(clp->arg);
+ input_files.push_back(clp->vstr);
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
index 71a5259ac27..60622f925b8 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -51,7 +47,7 @@ am_otftotfm_OBJECTS = automatic.$(OBJEXT) dvipsencoding.$(OBJEXT) \
glyphfilter.$(OBJEXT) metrics.$(OBJEXT) otftotfm.$(OBJEXT) \
secondary.$(OBJEXT) uniprop.$(OBJEXT) util.$(OBJEXT)
otftotfm_OBJECTS = $(am_otftotfm_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -72,8 +68,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -97,6 +91,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -109,9 +105,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -127,14 +122,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -142,24 +135,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = otftotfm.1
otftotfm_SOURCES = \
@@ -213,7 +217,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -236,7 +240,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
otftotfm$(EXEEXT): $(otftotfm_OBJECTS) $(otftotfm_DEPENDENCIES)
@rm -f otftotfm$(EXEEXT)
- $(CXXLINK) $(otftotfm_LDFLAGS) $(otftotfm_OBJECTS) $(otftotfm_LDADD) $(LIBS)
+ $(CXXLINK) $(otftotfm_OBJECTS) $(otftotfm_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -255,36 +259,35 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -377,22 +380,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -408,7 +410,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -457,12 +459,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -482,21 +492,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
$(top_builddir)/../../texk/kpathsea/.libs/libkpathsea.a:
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
index 3390da44971..94c1cc79486 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/dvipsencoding.cc
@@ -43,14 +43,14 @@ DvipsEncoding::add_glyphlist(String text)
int pos = 0, len = text.length();
while (1) {
// move to first nonblank
- while (pos < len && isspace(data[pos]))
+ while (pos < len && isspace((unsigned char) data[pos]))
pos++;
// parse line
if (pos >= len)
return 0;
else if (data[pos] != '#') {
int first = pos;
- for (; pos < len && !isspace(data[pos]) && data[pos] != ';'; pos++)
+ for (; pos < len && !isspace((unsigned char) data[pos]) && data[pos] != ';'; pos++)
/* nada */;
String glyph_name = text.substring(first, pos - first);
int value;
@@ -59,9 +59,9 @@ DvipsEncoding::add_glyphlist(String text)
if (first == pos
|| pos + 1 >= len
|| (data[pos] != ';' && data[pos] != ',')
- || !isxdigit(data[pos+1])
+ || !isxdigit((unsigned char) data[pos+1])
|| ((value = strtol(data + pos + 1, &next, 16)),
- (!isspace(*next) && *next && *next != ';' && *next != ',')))
+ (!isspace((unsigned char) *next) && *next && *next != ';' && *next != ',')))
return -1;
while (*next == ' ' || *next == '\t')
next++;
@@ -182,7 +182,7 @@ tokenize(const String &s, int &pos_in, int &line)
int pos = pos_in;
while (1) {
// skip whitespace
- while (pos < len && isspace(data[pos])) {
+ while (pos < len && isspace((unsigned char) data[pos])) {
if (data[pos] == '\n')
line++;
else if (data[pos] == '\r' && (pos + 1 == len || data[pos+1] != '\n'))
@@ -221,7 +221,7 @@ tokenize(const String &s, int &pos_in, int &line)
int first = pos;
while (pos < len && data[pos] == '/')
pos++;
- while (pos < len && data[pos] != '/' && !isspace(data[pos]) && data[pos] != '[' && data[pos] != ']' && data[pos] != '%' && data[pos] != '(' && data[pos] != '{' && data[pos] != '}')
+ while (pos < len && data[pos] != '/' && !isspace((unsigned char) data[pos]) && data[pos] != '[' && data[pos] != ']' && data[pos] != '%' && data[pos] != '(' && data[pos] != '{' && data[pos] != '}')
pos++;
pos_in = pos;
return s.substring(first, pos - first);
@@ -528,10 +528,10 @@ DvipsEncoding::parse_words(const String &s, int override, int wt, ErrorHandler *
const char *data = s.data();
const char *end = s.end();
while (data < end) {
- while (data < end && isspace(*data))
+ while (data < end && isspace((unsigned char) *data))
data++;
const char *first = data;
- while (data < end && !isspace(*data) && *data != ';')
+ while (data < end && !isspace((unsigned char) *data) && *data != ';')
data++;
if (data == first) {
data++; // step past semicolon (or harmlessly past EOS)
@@ -552,11 +552,11 @@ landmark(const String &filename, int line)
static String
trim_space(const String &s, int pos)
{
- while (pos < s.length() && isspace(s[pos]))
+ while (pos < s.length() && isspace((unsigned char) s[pos]))
pos++;
int epos = s.length();
for (int x = 0; x < 2; x++) {
- while (epos > pos && isspace(s[epos - 1]))
+ while (epos > pos && isspace((unsigned char) s[epos - 1]))
epos--;
if (epos == pos || s[epos - 1] != ';')
break;
@@ -599,35 +599,35 @@ DvipsEncoding::parse(String filename, bool ignore_ligkern, bool ignore_other, Er
while ((token = comment_tokenize(s, pos, line)))
if (token.length() >= 8
&& memcmp(token.data(), "LIGKERN", 7) == 0
- && isspace(token[7])
+ && isspace((unsigned char) token[7])
&& !ignore_ligkern) {
lerrh.set_landmark(landmark(filename, line));
parse_words(token.substring(8), 1, WT_LIGKERN, &lerrh);
} else if (token.length() >= 9
&& memcmp(token.data(), "LIGKERNX", 8) == 0
- && isspace(token[8])
+ && isspace((unsigned char) token[8])
&& !ignore_ligkern) {
lerrh.set_landmark(landmark(filename, line));
parse_words(token.substring(9), 1, WT_LIGKERN, &lerrh);
} else if (token.length() >= 10
&& memcmp(token.data(), "UNICODING", 9) == 0
- && isspace(token[9])
+ && isspace((unsigned char) token[9])
&& !ignore_other) {
lerrh.set_landmark(landmark(filename, line));
parse_words(token.substring(10), 1, WT_UNICODING, &lerrh);
} else if (token.length() >= 9
&& memcmp(token.data(), "POSITION", 8) == 0
- && isspace(token[8])
+ && isspace((unsigned char) token[8])
&& !ignore_other) {
lerrh.set_landmark(landmark(filename, line));
parse_words(token.substring(9), 1, WT_POSITION, &lerrh);
} else if (token.length() >= 13
&& memcmp(token.data(), "CODINGSCHEME", 12) == 0
- && isspace(token[12])
+ && isspace((unsigned char) token[12])
&& !ignore_other) {
_coding_scheme = trim_space(token, 13);
if (_coding_scheme.length() > 39)
@@ -640,7 +640,7 @@ DvipsEncoding::parse(String filename, bool ignore_ligkern, bool ignore_other, Er
} else if (token.length() >= 11
&& memcmp(token.data(), "WARNMISSING", 11) == 0
- && (token.length() == 11 || isspace(token[11]))
+ && (token.length() == 11 || isspace((unsigned char) token[11]))
&& !ignore_other) {
String value = trim_space(token, 11);
if (value == "1" || value == "yes" || value == "true" || !value)
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
index 832061e7782..beb666e84d2 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/glyphfilter.cc
@@ -100,14 +100,14 @@ GlyphFilter::add_pattern(const String& pattern, int ptype, ErrorHandler* errh)
const char* begin = pattern.begin();
const char* end = pattern.end();
- while (begin < end && isspace(*begin))
+ while (begin < end && isspace((unsigned char) *begin))
begin++;
if (begin >= end)
errh->error("missing pattern");
while (begin < end) {
const char* word = begin;
- while (word < end && !isspace(*word))
+ while (word < end && !isspace((unsigned char) *word))
word++;
bool negated = false;
if (begin < word && begin[0] == '!')
@@ -152,7 +152,7 @@ GlyphFilter::add_pattern(const String& pattern, int ptype, ErrorHandler* errh)
// move to next clause
next_clause:
- for (begin = word; begin < end && isspace(*begin); begin++)
+ for (begin = word; begin < end && isspace((unsigned char) *begin); begin++)
/* nada */;
}
}
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
index 4e203f75994..6875aeae000 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
index caf984eaf33..90f03edd240 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.cc
@@ -1,6 +1,6 @@
/* otftotfm.cc -- driver for translating OpenType fonts to TeX metrics
*
- * Copyright (c) 2003-2007 Eddie Kohler
+ * Copyright (c) 2003-2008 Eddie Kohler
*
* 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
@@ -131,77 +131,77 @@ using namespace Efont;
#define NO_UPDMAP_OPT (NO_OUTPUT_OPTS + G_UPDMAP)
#define NO_TRUETYPE_OPT (NO_OUTPUT_OPTS + G_TRUETYPE)
-#define CHAR_OPTTYPE (Clp_FirstUserType)
+#define CHAR_OPTTYPE (Clp_ValFirstUser)
static Clp_Option options[] = {
- { "script", 's', SCRIPT_OPT, Clp_ArgString, 0 },
- { "feature", 'f', FEATURE_OPT, Clp_ArgString, 0 },
- { "letter-feature", 0, LETTER_FEATURE_OPT, Clp_ArgString, 0 },
- { "lf", 0, LETTER_FEATURE_OPT, Clp_ArgString, 0 },
- { "include-substitutions", 0, INCLUDE_SUBS_OPT, Clp_ArgString, 0 },
- { "exclude-substitutions", 0, EXCLUDE_SUBS_OPT, Clp_ArgString, 0 },
+ { "script", 's', SCRIPT_OPT, Clp_ValString, 0 },
+ { "feature", 'f', FEATURE_OPT, Clp_ValString, 0 },
+ { "letter-feature", 0, LETTER_FEATURE_OPT, Clp_ValString, 0 },
+ { "lf", 0, LETTER_FEATURE_OPT, Clp_ValString, 0 },
+ { "include-substitutions", 0, INCLUDE_SUBS_OPT, Clp_ValString, 0 },
+ { "exclude-substitutions", 0, EXCLUDE_SUBS_OPT, Clp_ValString, 0 },
{ "clear-substitutions", 0, CLEAR_SUBS_OPT, 0, 0 },
- { "substitution-filter", 0, SUBS_FILTER_OPT, Clp_ArgString, 0 },
- { "subs-filter", 0, SUBS_FILTER_OPT, Clp_ArgString, 0 },
- { "encoding", 'e', ENCODING_OPT, Clp_ArgString, 0 },
- { "literal-encoding", 0, LITERAL_ENCODING_OPT, Clp_ArgString, 0 },
- { "base-encodings", 0, BASE_ENCODINGS_OPT, Clp_ArgString, 0 },
- { "extend", 'E', EXTEND_OPT, Clp_ArgDouble, 0 },
- { "slant", 'S', SLANT_OPT, Clp_ArgDouble, 0 },
- { "letterspacing", 'L', LETTERSPACE_OPT, Clp_ArgInt, 0 },
- { "letterspace", 'L', LETTERSPACE_OPT, Clp_ArgInt, 0 },
- { "min-kern", 'k', MINIMUM_KERN_OPT, Clp_ArgDouble, 0 },
- { "minimum-kern", 'k', MINIMUM_KERN_OPT, Clp_ArgDouble, 0 },
- { "kern-precision", 'k', MINIMUM_KERN_OPT, Clp_ArgDouble, 0 },
- { "ligkern", 0, LIGKERN_OPT, Clp_ArgString, 0 },
- { "position", 0, POSITION_OPT, Clp_ArgString, 0 },
+ { "substitution-filter", 0, SUBS_FILTER_OPT, Clp_ValString, 0 },
+ { "subs-filter", 0, SUBS_FILTER_OPT, Clp_ValString, 0 },
+ { "encoding", 'e', ENCODING_OPT, Clp_ValString, 0 },
+ { "literal-encoding", 0, LITERAL_ENCODING_OPT, Clp_ValString, 0 },
+ { "base-encodings", 0, BASE_ENCODINGS_OPT, Clp_ValString, 0 },
+ { "extend", 'E', EXTEND_OPT, Clp_ValDouble, 0 },
+ { "slant", 'S', SLANT_OPT, Clp_ValDouble, 0 },
+ { "letterspacing", 'L', LETTERSPACE_OPT, Clp_ValInt, 0 },
+ { "letterspace", 'L', LETTERSPACE_OPT, Clp_ValInt, 0 },
+ { "min-kern", 'k', MINIMUM_KERN_OPT, Clp_ValDouble, 0 },
+ { "minimum-kern", 'k', MINIMUM_KERN_OPT, Clp_ValDouble, 0 },
+ { "kern-precision", 'k', MINIMUM_KERN_OPT, Clp_ValDouble, 0 },
+ { "ligkern", 0, LIGKERN_OPT, Clp_ValString, 0 },
+ { "position", 0, POSITION_OPT, Clp_ValString, 0 },
{ "warn-missing", 0, WARN_MISSING_OPT, 0, Clp_Negate },
- { "no-encoding-commands", 0, NO_ECOMMAND_OPT, 0, Clp_OnlyNegated },
+ { "no-encoding-commands", 0, NO_ECOMMAND_OPT, 0, 0 },
{ "default-ligkern", 0, DEFAULT_LIGKERN_OPT, 0, Clp_Negate },
- { "unicoding", 0, UNICODING_OPT, Clp_ArgString, 0 },
- { "coding-scheme", 0, CODINGSCHEME_OPT, Clp_ArgString, 0 },
+ { "unicoding", 0, UNICODING_OPT, Clp_ValString, 0 },
+ { "coding-scheme", 0, CODINGSCHEME_OPT, Clp_ValString, 0 },
{ "boundary-char", 0, BOUNDARY_CHAR_OPT, CHAR_OPTTYPE, 0 },
{ "altselector", 0, ALTSELECTOR_CHAR_OPT, CHAR_OPTTYPE, Clp_PreferredMatch },
{ "altselector-char", 0, ALTSELECTOR_CHAR_OPT, CHAR_OPTTYPE, 0 },
- { "altselector-feature", 0, ALTSELECTOR_FEATURE_OPT, Clp_ArgString, 0 },
- { "design-size", 0, DESIGN_SIZE_OPT, Clp_ArgDouble, 0 },
- { "include-alternates", 0, INCLUDE_ALTERNATES_OPT, Clp_ArgString, 0 },
- { "exclude-alternates", 0, EXCLUDE_ALTERNATES_OPT, Clp_ArgString, 0 },
+ { "altselector-feature", 0, ALTSELECTOR_FEATURE_OPT, Clp_ValString, 0 },
+ { "design-size", 0, DESIGN_SIZE_OPT, Clp_ValDouble, 0 },
+ { "include-alternates", 0, INCLUDE_ALTERNATES_OPT, Clp_ValString, 0 },
+ { "exclude-alternates", 0, EXCLUDE_ALTERNATES_OPT, Clp_ValString, 0 },
{ "clear-alternates", 0, CLEAR_ALTERNATES_OPT, 0, 0 },
- { "alternates-filter", 0, ALTERNATES_FILTER_OPT, Clp_ArgString, 0 },
- { "space-factor", 0, SPACE_FACTOR_OPT, Clp_ArgDouble, 0 },
+ { "alternates-filter", 0, ALTERNATES_FILTER_OPT, Clp_ValString, 0 },
+ { "space-factor", 0, SPACE_FACTOR_OPT, Clp_ValDouble, 0 },
{ "math-spacing", 0, MATH_SPACING_OPT, CHAR_OPTTYPE, Clp_Negate | Clp_Optional },
{ "pl", 'p', PL_OPT, 0, 0 },
{ "virtual", 0, VIRTUAL_OPT, 0, Clp_Negate },
- { "no-encoding", 0, NO_ENCODING_OPT, 0, Clp_OnlyNegated },
- { "no-type1", 0, NO_TYPE1_OPT, 0, Clp_OnlyNegated },
- { "no-truetype", 0, NO_TRUETYPE_OPT, 0, Clp_OnlyNegated },
- { "no-dotlessj", 0, NO_DOTLESSJ_OPT, 0, Clp_OnlyNegated },
- { "no-updmap", 0, NO_UPDMAP_OPT, 0, Clp_OnlyNegated },
- { "map-file", 0, MAP_FILE_OPT, Clp_ArgString, Clp_Negate },
- { "output-encoding", 0, OUTPUT_ENCODING_OPT, Clp_ArgString, Clp_Optional },
+ { "no-encoding", 0, NO_ENCODING_OPT, 0, 0 },
+ { "no-type1", 0, NO_TYPE1_OPT, 0, 0 },
+ { "no-truetype", 0, NO_TRUETYPE_OPT, 0, 0 },
+ { "no-dotlessj", 0, NO_DOTLESSJ_OPT, 0, 0 },
+ { "no-updmap", 0, NO_UPDMAP_OPT, 0, 0 },
+ { "map-file", 0, MAP_FILE_OPT, Clp_ValString, Clp_Negate },
+ { "output-encoding", 0, OUTPUT_ENCODING_OPT, Clp_ValString, Clp_Optional },
{ "automatic", 'a', AUTOMATIC_OPT, 0, Clp_Negate },
- { "name", 'n', FONT_NAME_OPT, Clp_ArgString, 0 },
- { "vendor", 'v', VENDOR_OPT, Clp_ArgString, 0 },
- { "typeface", 0, TYPEFACE_OPT, Clp_ArgString, 0 },
+ { "name", 'n', FONT_NAME_OPT, Clp_ValString, 0 },
+ { "vendor", 'v', VENDOR_OPT, Clp_ValString, 0 },
+ { "typeface", 0, TYPEFACE_OPT, Clp_ValString, 0 },
- { "encoding-directory", 0, ENCODING_DIR_OPT, Clp_ArgString, 0 },
- { "pl-directory", 0, PL_DIR_OPT, Clp_ArgString, 0 },
- { "tfm-directory", 0, TFM_DIR_OPT, Clp_ArgString, 0 },
- { "vpl-directory", 0, VPL_DIR_OPT, Clp_ArgString, 0 },
- { "vf-directory", 0, VF_DIR_OPT, Clp_ArgString, 0 },
- { "type1-directory", 0, TYPE1_DIR_OPT, Clp_ArgString, 0 },
- { "truetype-directory", 0, TRUETYPE_DIR_OPT, Clp_ArgString, 0 },
+ { "encoding-directory", 0, ENCODING_DIR_OPT, Clp_ValString, 0 },
+ { "pl-directory", 0, PL_DIR_OPT, Clp_ValString, 0 },
+ { "tfm-directory", 0, TFM_DIR_OPT, Clp_ValString, 0 },
+ { "vpl-directory", 0, VPL_DIR_OPT, Clp_ValString, 0 },
+ { "vf-directory", 0, VF_DIR_OPT, Clp_ValString, 0 },
+ { "type1-directory", 0, TYPE1_DIR_OPT, Clp_ValString, 0 },
+ { "truetype-directory", 0, TRUETYPE_DIR_OPT, Clp_ValString, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
- { "glyphlist", 0, GLYPHLIST_OPT, Clp_ArgString, 0 },
- { "no-create", 0, NOCREATE_OPT, 0, Clp_OnlyNegated },
+ { "glyphlist", 0, GLYPHLIST_OPT, Clp_ValString, 0 },
+ { "no-create", 0, NOCREATE_OPT, 0, 0 },
{ "force", 0, FORCE_OPT, 0, Clp_Negate },
{ "verbose", 'V', VERBOSE_OPT, 0, Clp_Negate },
- { "kpathsea-debug", 0, KPATHSEA_DEBUG_OPT, Clp_ArgInt, 0 },
+ { "kpathsea-debug", 0, KPATHSEA_DEBUG_OPT, Clp_ValInt, 0 },
{ "help", 'h', HELP_OPT, 0, 0 },
{ "version", 0, VERSION_OPT, 0, 0 },
@@ -415,12 +415,17 @@ handle_sigchld()
String
suffix_font_name(const String &font_name, const String &suffix)
{
- int pos = font_name.length();
- while (pos > 0 && (isdigit(font_name[pos-1]) || font_name[pos-1] == '-' || font_name[pos-1] == '+'))
- pos--;
- if (pos == 0)
- pos = font_name.length();
- return font_name.substring(0, pos) + suffix + font_name.substring(pos);
+ const char *begin = font_name.begin(), *end = font_name.end();
+ while (end > begin && isdigit((unsigned char) end[-1]))
+ --end;
+ if (end < font_name.end() && end > begin && end[-1] != '-' && end[-1] != '+')
+ end = font_name.end();
+ else
+ while (end > begin && (end[-1] == '-' || end[-1] == '+'))
+ --end;
+ if (end == begin)
+ end = font_name.end();
+ return font_name.substring(begin, end) + suffix + font_name.substring(end, font_name.end());
}
static inline String
@@ -1407,7 +1412,7 @@ do_file(const String &otf_filename, const OpenType::Font &otf,
// make it reasonable for the shell
StringAccum sa;
for (int i = 0; i < typeface.length(); i++)
- if (isalnum(typeface[i]) || typeface[i] == '_' || typeface[i] == '-' || typeface[i] == '.' || typeface[i] == ',' || typeface[i] == '+')
+ if (isalnum((unsigned char) typeface[i]) || typeface[i] == '_' || typeface[i] == '-' || typeface[i] == '.' || typeface[i] == ',' || typeface[i] == '+')
sa << typeface[i];
set_typeface(sa.length() ? sa.take_string() : font_name, false);
@@ -1562,10 +1567,10 @@ extern "C" {
static int
clp_parse_char(Clp_Parser *clp, const char *arg, int complain, void *)
{
- if (arg[0] && !arg[1] && !isdigit(arg[0])) {
+ if (arg[0] && !arg[1] && !isdigit((unsigned char) arg[0])) {
clp->val.i = (unsigned char)arg[0];
return 1;
- } else if (arg[0] == '-' || isdigit(arg[0])) {
+ } else if (arg[0] == '-' || isdigit((unsigned char) arg[0])) {
char *end;
clp->val.i = strtol(arg, &end, 10);
if (clp->val.i <= 255 && !*end)
@@ -1586,26 +1591,26 @@ parse_base_encodings(const String &filename, ErrorHandler *errh)
str.c_str();
const char *s_end = str.end();
for (const char *s = str.begin(); s != s_end; ) {
- while (s != s_end && isspace(*s) && *s != '\n' && *s != '\r')
+ while (s != s_end && isspace((unsigned char) *s) && *s != '\n' && *s != '\r')
s++;
// skip comments and blank lines
if (s != s_end && *s != '%' && *s != '#' && *s != '\n' && *s != '\r') {
const char *w1 = s;
- while (s != s_end && !isspace(*s))
+ while (s != s_end && !isspace((unsigned char) *s))
s++;
BaseEncoding *be = new BaseEncoding;
be->font_name = str.substring(w1, s);
- while (s != s_end && isspace(*s) && *s != '\n' && *s != '\r')
+ while (s != s_end && isspace((unsigned char) *s) && *s != '\n' && *s != '\r')
s++;
const char *w2 = s;
- while (s != s_end && !isspace(*s))
+ while (s != s_end && !isspace((unsigned char) *s))
s++;
String efile = str.substring(w2, s);
- while (s != s_end && isspace(*s) && *s != '\n' && *s != '\r')
+ while (s != s_end && isspace((unsigned char) *s) && *s != '\n' && *s != '\r')
s++;
- if (s != s_end && !isspace(*s) && *s != '%' && *s != '#') {
+ if (s != s_end && !isspace((unsigned char) *s) && *s != '%' && *s != '#') {
const char *w3 = s;
- while (s != s_end && !isspace(*s))
+ while (s != s_end && !isspace((unsigned char) *s))
s++;
be->secondary = str.substring(w3, s);
}
@@ -1679,7 +1684,7 @@ main(int argc, char *argv[])
switch (opt) {
case SCRIPT_OPT: {
- String arg = clp->arg;
+ String arg = clp->vstr;
int period = arg.find_left('.');
OpenType::Tag scr(period <= 0 ? arg : arg.substring(0, period));
if (scr.valid() && period > 0) {
@@ -1698,7 +1703,7 @@ main(int argc, char *argv[])
}
case FEATURE_OPT: {
- OpenType::Tag t(clp->arg);
+ OpenType::Tag t(clp->vstr);
if (!t.valid())
usage_error(errh, "bad feature tag");
else if (feature_filters[t])
@@ -1713,7 +1718,7 @@ main(int argc, char *argv[])
}
case LETTER_FEATURE_OPT: {
- OpenType::Tag t(clp->arg);
+ OpenType::Tag t(clp->vstr);
if (!t.valid())
usage_error(errh, "bad feature tag");
else if (feature_filters[t])
@@ -1733,7 +1738,7 @@ main(int argc, char *argv[])
/* fallthru */
case EXCLUDE_SUBS_OPT:
case INCLUDE_SUBS_OPT:
- current_substitution_filter.add_substitution_filter(clp->arg, opt == EXCLUDE_SUBS_OPT, errh);
+ current_substitution_filter.add_substitution_filter(clp->vstr, opt == EXCLUDE_SUBS_OPT, errh);
current_filter_ptr = 0;
break;
@@ -1745,18 +1750,18 @@ main(int argc, char *argv[])
case ENCODING_OPT:
if (encoding_file)
usage_error(errh, "encoding specified twice");
- encoding_file = clp->arg;
+ encoding_file = clp->vstr;
break;
case LITERAL_ENCODING_OPT:
if (encoding_file)
usage_error(errh, "encoding specified twice");
- encoding_file = clp->arg;
+ encoding_file = clp->vstr;
literal_encoding = true;
break;
case BASE_ENCODINGS_OPT:
- base_encoding_files.push_back(clp->arg);
+ base_encoding_files.push_back(clp->vstr);
break;
case EXTEND_OPT:
@@ -1785,7 +1790,7 @@ main(int argc, char *argv[])
case MATH_SPACING_OPT:
math_spacing = !clp->negated;
- if (math_spacing && clp->have_arg) {
+ if (math_spacing && clp->have_val) {
if (clp->val.i < 0 || clp->val.i > 255)
usage_error(errh, "--math-spacing skew character must be between 0 and 255");
skew_char = clp->val.i;
@@ -1801,11 +1806,11 @@ main(int argc, char *argv[])
break;
case LIGKERN_OPT:
- ligkern.push_back(clp->arg);
+ ligkern.push_back(clp->vstr);
break;
case POSITION_OPT:
- pos.push_back(clp->arg);
+ pos.push_back(clp->vstr);
break;
case WARN_MISSING_OPT:
@@ -1829,7 +1834,7 @@ main(int argc, char *argv[])
break;
case ALTSELECTOR_FEATURE_OPT: {
- OpenType::Tag t(clp->arg);
+ OpenType::Tag t(clp->vstr);
if (!t.valid())
usage_error(errh, "bad feature tag");
else if (altselector_feature_filters[t])
@@ -1848,7 +1853,7 @@ main(int argc, char *argv[])
/* fallthru */
case EXCLUDE_ALTERNATES_OPT:
case INCLUDE_ALTERNATES_OPT:
- current_alternate_filter.add_alternate_filter(clp->arg, opt == EXCLUDE_ALTERNATES_OPT, errh);
+ current_alternate_filter.add_alternate_filter(clp->vstr, opt == EXCLUDE_ALTERNATES_OPT, errh);
current_filter_ptr = 0;
break;
@@ -1858,13 +1863,13 @@ main(int argc, char *argv[])
break;
case UNICODING_OPT:
- unicoding.push_back(clp->arg);
+ unicoding.push_back(clp->vstr);
break;
case CODINGSCHEME_OPT:
if (codingscheme)
usage_error(errh, "coding scheme specified twice");
- codingscheme = clp->arg;
+ codingscheme = clp->vstr;
if (codingscheme.length() > 39)
errh->warning("only first 39 characters of coding scheme are significant");
if (codingscheme.find_left('(') >= 0 || codingscheme.find_left(')') >= 0)
@@ -1876,12 +1881,12 @@ main(int argc, char *argv[])
break;
case VENDOR_OPT:
- if (!set_vendor(clp->arg))
+ if (!set_vendor(clp->vstr))
usage_error(errh, "vendor name specified twice");
break;
case TYPEFACE_OPT:
- if (!set_typeface(clp->arg, true))
+ if (!set_typeface(clp->vstr, true))
usage_error(errh, "typeface name specified twice");
break;
@@ -1903,7 +1908,7 @@ main(int argc, char *argv[])
case OUTPUT_ENCODING_OPT:
if (out_encoding_file)
usage_error(errh, "encoding output file specified twice");
- out_encoding_file = (clp->have_arg ? clp->arg : "-");
+ out_encoding_file = (clp->have_val ? clp->vstr : "-");
output_flags = G_ENCODING;
break;
@@ -1916,7 +1921,7 @@ main(int argc, char *argv[])
output_flags &= ~G_PSFONTSMAP;
else {
output_flags |= G_PSFONTSMAP;
- if (!set_map_file(clp->arg))
+ if (!set_map_file(clp->vstr))
usage_error(errh, "map file specified twice");
}
break;
@@ -1936,7 +1941,7 @@ main(int argc, char *argv[])
case VPL_DIR_OPT:
case TYPE1_DIR_OPT:
case TRUETYPE_DIR_OPT:
- if (!setodir(opt - DIR_OPTS, clp->arg))
+ if (!setodir(opt - DIR_OPTS, clp->vstr))
usage_error(errh, "%s directory specified twice", odirname(opt - DIR_OPTS));
break;
@@ -1944,11 +1949,11 @@ main(int argc, char *argv[])
font_name:
if (font_name)
usage_error(errh, "font name specified twice");
- font_name = clp->arg;
+ font_name = clp->vstr;
break;
case GLYPHLIST_OPT:
- glyphlist_files.push_back(clp->arg);
+ glyphlist_files.push_back(clp->vstr);
break;
case QUERY_FEATURES_OPT:
@@ -1990,7 +1995,7 @@ main(int argc, char *argv[])
case VERSION_OPT:
printf("otftotfm (LCDF typetools) %s\n", VERSION);
- printf("Copyright (C) 2002-2007 Eddie Kohler\n\
+ printf("Copyright (C) 2002-2008 Eddie Kohler\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty, not even for merchantability or fitness for a\n\
particular purpose.\n");
@@ -2008,7 +2013,7 @@ particular purpose.\n");
else if (input_file)
goto font_name;
else
- input_file = clp->arg;
+ input_file = clp->vstr;
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
index 190e256e6a5..2cdd9df1114 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_t1dotlessj_OBJECTS = t1dotlessj.$(OBJEXT)
t1dotlessj_OBJECTS = $(am_t1dotlessj_OBJECTS)
t1dotlessj_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -67,8 +63,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -92,6 +86,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +100,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,14 +117,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -137,24 +130,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = t1dotlessj.1
t1dotlessj_SOURCES = t1dotlessj.cc
@@ -197,7 +201,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -220,7 +224,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1dotlessj$(EXEEXT): $(t1dotlessj_OBJECTS) $(t1dotlessj_DEPENDENCIES)
@rm -f t1dotlessj$(EXEEXT)
- $(CXXLINK) $(t1dotlessj_LDFLAGS) $(t1dotlessj_OBJECTS) $(t1dotlessj_LDADD) $(LIBS)
+ $(CXXLINK) $(t1dotlessj_OBJECTS) $(t1dotlessj_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -231,22 +235,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1dotlessj.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -339,22 +342,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -370,7 +372,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -419,12 +421,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -444,21 +454,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
index 5c458810f67..eeeeadbceb2 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1
@@ -1,4 +1,4 @@
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
index 78f73cb36b0..55859bcbf09 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
@@ -51,10 +51,10 @@ using namespace Efont;
#define OUTPUT_OPT 306
#define NAME_OPT 307
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "help", 'h', HELP_OPT, 0, 0 },
- { "name", 'n', NAME_OPT, Clp_ArgString, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "name", 'n', NAME_OPT, Clp_ValString, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "pfa", 'a', PFA_OPT, 0, 0 },
{ "pfb", 'b', PFA_OPT, 0, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
@@ -286,7 +286,7 @@ main(int argc, char *argv[])
break;
case NAME_OPT:
- font_name = clp->arg;
+ font_name = clp->vstr;
break;
case PFA_OPT:
@@ -301,10 +301,10 @@ main(int argc, char *argv[])
output_file:
if (outputf)
usage_error(errh, "output file specified twice");
- if (strcmp(clp->arg, "-") == 0)
+ if (strcmp(clp->vstr, "-") == 0)
outputf = stdout;
- else if (!(outputf = fopen(clp->arg, "wb")))
- errh->fatal(EXIT_ERROR, "%s: %s", clp->arg, strerror(errno));
+ else if (!(outputf = fopen(clp->vstr, "wb")))
+ errh->fatal(EXIT_ERROR, "%s: %s", clp->vstr, strerror(errno));
break;
case VERSION_OPT:
@@ -327,7 +327,7 @@ particular purpose.\n");
else if (input_file)
goto output_file;
else
- input_file = clp->arg;
+ input_file = clp->vstr;
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
index 39ce4541a67..b328e968ab4 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_t1lint_OBJECTS = cscheck.$(OBJEXT) t1lint.$(OBJEXT)
t1lint_OBJECTS = $(am_t1lint_OBJECTS)
t1lint_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -71,8 +67,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -96,6 +90,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,9 +104,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -126,14 +121,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -141,24 +134,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = t1lint.1
t1lint_SOURCES = cscheck.hh cscheck.cc \
@@ -203,7 +207,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -226,7 +230,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1lint$(EXEEXT): $(t1lint_OBJECTS) $(t1lint_DEPENDENCIES)
@rm -f t1lint$(EXEEXT)
- $(CXXLINK) $(t1lint_LDFLAGS) $(t1lint_OBJECTS) $(t1lint_LDADD) $(LIBS)
+ $(CXXLINK) $(t1lint_OBJECTS) $(t1lint_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -238,22 +242,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1lint.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -346,22 +349,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -377,7 +379,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -426,12 +428,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -451,21 +461,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
index 6d062c5f3a3..b4c19fc11ee 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
+++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1
@@ -1,4 +1,4 @@
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc b/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
index 0ce45b54f7b..cebca24615a 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
+++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.cc
@@ -42,7 +42,7 @@ using namespace Efont;
#define HELP_OPT 302
#define QUIET_OPT 303
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "help", 'h', HELP_OPT, 0, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
{ "version", 0, VERSION_OPT, 0, 0 },
@@ -412,7 +412,7 @@ particular purpose.\n");
break;
case Clp_NotOption:
- do_file(clp->arg, psres, errh);
+ do_file(clp->vstr, psres, errh);
nfiles++;
break;
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
index e75edbfa5e5..095287ad7b9 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -51,7 +47,7 @@ am_t1reencode_OBJECTS = md5.$(OBJEXT) t1reencode.$(OBJEXT) \
util.$(OBJEXT)
t1reencode_OBJECTS = $(am_t1reencode_OBJECTS)
t1reencode_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -72,8 +68,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -97,6 +91,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -109,9 +105,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -127,14 +122,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -142,24 +135,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = t1reencode.1
t1reencode_SOURCES = md5.c md5.h \
@@ -205,7 +209,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -228,7 +232,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1reencode$(EXEEXT): $(t1reencode_OBJECTS) $(t1reencode_DEPENDENCIES)
@rm -f t1reencode$(EXEEXT)
- $(CXXLINK) $(t1reencode_LDFLAGS) $(t1reencode_OBJECTS) $(t1reencode_LDADD) $(LIBS)
+ $(CXXLINK) $(t1reencode_OBJECTS) $(t1reencode_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -241,36 +245,35 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -363,22 +366,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -394,7 +396,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -443,12 +445,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -468,21 +478,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
index 0abe41beb6c..a9dd293326f 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1
@@ -1,4 +1,4 @@
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
index 0b561864cf1..6a4eedf622a 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
+++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.cc
@@ -48,16 +48,16 @@ using namespace Efont;
#define FONTNAME_OPT 308
#define FULLNAME_OPT 309
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "help", 'h', HELP_OPT, 0, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "pfa", 'a', PFA_OPT, 0, 0 },
{ "pfb", 'b', PFA_OPT, 0, 0 },
- { "name", 'n', FONTNAME_OPT, Clp_ArgString, 0 },
- { "fullname", 'N', FULLNAME_OPT, Clp_ArgString, 0 },
- { "full-name", 'N', FULLNAME_OPT, Clp_ArgString, 0 },
- { "encoding", 'e', ENCODING_OPT, Clp_ArgString, 0 },
- { "encoding-text", 'E', ENCODING_TEXT_OPT, Clp_ArgString, 0 },
+ { "name", 'n', FONTNAME_OPT, Clp_ValString, 0 },
+ { "fullname", 'N', FULLNAME_OPT, Clp_ValString, 0 },
+ { "full-name", 'N', FULLNAME_OPT, Clp_ValString, 0 },
+ { "encoding", 'e', ENCODING_OPT, Clp_ValString, 0 },
+ { "encoding-text", 'E', ENCODING_TEXT_OPT, Clp_ValString, 0 },
{ "version", 0, VERSION_OPT, 0, 0 },
};
@@ -785,7 +785,7 @@ tokenize(const String &s, int &pos_in, int &line)
int pos = pos_in;
while (1) {
// skip whitespace
- while (pos < len && isspace(data[pos])) {
+ while (pos < len && isspace((unsigned char) data[pos])) {
if (data[pos] == '\n')
line++;
else if (data[pos] == '\r' && (pos + 1 == len || data[pos+1] != '\n'))
@@ -824,7 +824,7 @@ tokenize(const String &s, int &pos_in, int &line)
int first = pos;
while (pos < len && data[pos] == '/')
pos++;
- while (pos < len && data[pos] != '/' && !isspace(data[pos]) && data[pos] != '[' && data[pos] != ']' && data[pos] != '%' && data[pos] != '(' && data[pos] != '{' && data[pos] != '}')
+ while (pos < len && data[pos] != '/' && !isspace((unsigned char) data[pos]) && data[pos] != '[' && data[pos] != ']' && data[pos] != '%' && data[pos] != '(' && data[pos] != '{' && data[pos] != '}')
pos++;
pos_in = pos;
return s.substring(first, pos - first);
@@ -945,31 +945,31 @@ main(int argc, char *argv[])
case ENCODING_OPT:
if (encoding_file || encoding_text)
errh->fatal("encoding already specified");
- encoding_file = clp->arg;
+ encoding_file = clp->vstr;
break;
case ENCODING_TEXT_OPT:
if (encoding_file || encoding_text)
errh->fatal("encoding already specified");
- encoding_text = clp->arg;
+ encoding_text = clp->vstr;
break;
case FONTNAME_OPT:
if (new_font_name)
errh->fatal("font name already specified");
- new_font_name = clp->arg;
+ new_font_name = clp->vstr;
break;
case FULLNAME_OPT:
if (new_full_name)
errh->fatal("full name already specified");
- new_full_name = clp->arg;
+ new_full_name = clp->vstr;
break;
case OUTPUT_OPT:
if (output_file)
errh->fatal("output file already specified");
- output_file = clp->arg;
+ output_file = clp->vstr;
break;
case PFA_OPT:
@@ -998,9 +998,9 @@ particular purpose.\n");
if (input_file && output_file)
errh->fatal("too many arguments");
else if (input_file)
- output_file = clp->arg;
+ output_file = clp->vstr;
else
- input_file = clp->arg;
+ input_file = clp->vstr;
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
index 02df61e63eb..0ceaa1c4443 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_t1testpage_OBJECTS = t1testpage.$(OBJEXT)
t1testpage_OBJECTS = $(am_t1testpage_OBJECTS)
t1testpage_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -67,8 +63,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -92,6 +86,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +100,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,14 +117,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -137,24 +130,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = t1testpage.1
t1testpage_SOURCES = t1testpage.cc
@@ -197,7 +201,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -220,7 +224,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
t1testpage$(EXEEXT): $(t1testpage_OBJECTS) $(t1testpage_DEPENDENCIES)
@rm -f t1testpage$(EXEEXT)
- $(CXXLINK) $(t1testpage_LDFLAGS) $(t1testpage_OBJECTS) $(t1testpage_LDADD) $(LIBS)
+ $(CXXLINK) $(t1testpage_OBJECTS) $(t1testpage_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -231,22 +235,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1testpage.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -339,22 +342,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -370,7 +372,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -419,12 +421,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -444,21 +454,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
index e1d7aa95117..d60079bdc11 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1
@@ -1,4 +1,4 @@
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
index e857a7ce157..139dc569dc8 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
+++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.cc
@@ -52,11 +52,11 @@ using namespace Efont;
#define GLYPH_OPT 304
#define SMOKE_OPT 305
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "help", 'h', HELP_OPT, 0, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "version", 0, VERSION_OPT, 0, 0 },
- { "glyph", 'g', GLYPH_OPT, Clp_ArgString, 0 },
+ { "glyph", 'g', GLYPH_OPT, Clp_ValString, 0 },
{ "smoke", 's', SMOKE_OPT, 0, Clp_Negate }
};
@@ -422,7 +422,7 @@ click_strcmp(PermString a, PermString b)
const char *bd = b.c_str(), *be = b.c_str() + b.length();
while (ad < ae && bd < be) {
- if (isdigit(*ad) && isdigit(*bd)) {
+ if (isdigit((unsigned char) *ad) && isdigit((unsigned char) *bd)) {
// compare the two numbers, but don't treat them as numbers in
// case of overflow
// first, skip initial '0's
@@ -434,9 +434,9 @@ click_strcmp(PermString a, PermString b)
int longer_zeros = (ad - iad) - (bd - ibd);
// skip to end of number
const char *nad = ad, *nbd = bd;
- while (ad < ae && isdigit(*ad))
+ while (ad < ae && isdigit((unsigned char) *ad))
ad++;
- while (bd < be && isdigit(*bd))
+ while (bd < be && isdigit((unsigned char) *bd))
bd++;
// longer number must be larger
if ((ad - nad) != (bd - nbd))
@@ -448,12 +448,12 @@ click_strcmp(PermString a, PermString b)
// finally, longer string of initial '0's wins
if (longer_zeros != 0)
return longer_zeros;
- } else if (isdigit(*ad))
- return (isalpha(*bd) ? -1 : 1);
- else if (isdigit(*bd))
- return (isalpha(*ad) ? 1 : -1);
+ } else if (isdigit((unsigned char) *ad))
+ return (isalpha((unsigned char) *bd) ? -1 : 1);
+ else if (isdigit((unsigned char) *bd))
+ return (isalpha((unsigned char) *ad) ? 1 : -1);
else {
- int d = tolower(*ad) - tolower(*bd);
+ int d = tolower((unsigned char) *ad) - tolower((unsigned char) *bd);
if (d != 0)
return d;
ad++;
@@ -535,12 +535,12 @@ main(int argc, char *argv[])
switch (opt) {
case GLYPH_OPT: {
- const char* s = clp->arg, *end = s + strlen(s);
+ const char* s = clp->vstr, *end = s + strlen(s);
while (s < end) {
- while (s < end && isspace(*s))
+ while (s < end && isspace((unsigned char) *s))
s++;
const char* word = s;
- while (s < end && !isspace(*s))
+ while (s < end && !isspace((unsigned char) *s))
s++;
if (word < s)
glyph_patterns.push_back(String(word, s - word));
@@ -555,7 +555,7 @@ main(int argc, char *argv[])
case OUTPUT_OPT:
if (output_file)
errh->fatal("output file already specified");
- output_file = clp->arg;
+ output_file = clp->vstr;
break;
case VERSION_OPT:
@@ -575,7 +575,7 @@ particular purpose.\n");
case Clp_NotOption:
if (font)
errh->fatal("font already specified");
- do_file(clp->arg, psres, errh);
+ do_file(clp->vstr, psres, errh);
break;
case Clp_Done:
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
index a7bac6919e6..a91aac6bbd5 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,7 +46,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_ttftotype42_OBJECTS = ttftotype42.$(OBJEXT)
ttftotype42_OBJECTS = $(am_ttftotype42_OBJECTS)
ttftotype42_DEPENDENCIES = ../libefont/libefont.a ../liblcdf/liblcdf.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -67,8 +63,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -92,6 +86,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FIXLIBC_O = @FIXLIBC_O@
+GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +100,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,14 +117,12 @@ SHELL = @SHELL@
STRIP = @STRIP@
TEMPLATE_OBJS = @TEMPLATE_OBJS@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -137,24 +130,35 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
+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@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
man_MANS = ttftotype42.1
ttftotype42_SOURCES = ttftotype42.cc
@@ -197,7 +201,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -220,7 +224,7 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
ttftotype42$(EXEEXT): $(ttftotype42_OBJECTS) $(ttftotype42_DEPENDENCIES)
@rm -f ttftotype42$(EXEEXT)
- $(CXXLINK) $(ttftotype42_LDFLAGS) $(ttftotype42_OBJECTS) $(ttftotype42_LDADD) $(LIBS)
+ $(CXXLINK) $(ttftotype42_OBJECTS) $(ttftotype42_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -231,22 +235,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttftotype42.Po@am__quote@
.cc.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cc.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -339,22 +342,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -370,7 +372,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -419,12 +421,20 @@ info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man: install-man1
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -444,21 +454,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
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-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-man uninstall-man1
+ uninstall-man uninstall-man1
# 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.
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
index 1718a8ec24e..8890bd167eb 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1
@@ -1,4 +1,4 @@
-.ds V 2.66
+.ds V 2.67
.de M
.BR "\\$1" "(\\$2)\\$3"
..
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
index 3dc95dc90e2..c47ff374ae3 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.cc
@@ -48,9 +48,9 @@ using namespace Efont;
#define QUIET_OPT 303
#define OUTPUT_OPT 306
-Clp_Option options[] = {
+const Clp_Option options[] = {
{ "help", 'h', HELP_OPT, 0, 0 },
- { "output", 'o', OUTPUT_OPT, Clp_ArgString, 0 },
+ { "output", 'o', OUTPUT_OPT, Clp_ValString, 0 },
{ "quiet", 'q', QUIET_OPT, 0, Clp_Negate },
{ "version", 'v', VERSION_OPT, 0, 0 },
};
@@ -346,7 +346,7 @@ particular purpose.\n");
output_file:
if (output_file)
usage_error(errh, "output file specified twice");
- output_file = clp->arg;
+ output_file = clp->vstr;
break;
case Clp_NotOption:
@@ -355,7 +355,7 @@ particular purpose.\n");
else if (input_file)
goto output_file;
else
- input_file = clp->arg;
+ input_file = clp->vstr;
break;
case Clp_Done: